Messages in this thread | | | Date | Fri, 2 Sep 2022 23:05:30 +0530 | From | Vinod Koul <> | Subject | Re: [PATCH v3] phy: rockchip-inno-usb2: Return zero after otg sync |
| |
On 24-08-22, 08:25, Peter Geis wrote: > The otg sync state patch reuses the ret variable, but fails to set it to > zero after use. This leads to a situation when the otg port is in > peripheral mode where the otg phy aborts halfway through setup. It also > fails to account for a failure to register the extcon notifier. Fix this > by using our own variable and skipping otg sync in case of failure. > > Fixes: 8dc60f8da22f ("phy: rockchip-inno-usb2: Sync initial otg state") >
No blank here please
> Reported-by: Markus Reichl <m.reichl@fivetechno.de> > Reported-by: Michael Riesch <michael.riesch@wolfvision.net> > Signed-off-by: Peter Geis <pgwipeout@gmail.com> > Tested-by: Michael Riesch <michael.riesch@wolfvision.net> > Tested-by: Markus Reichl <m.reichl@fivetechno.de> > --- > Changelog: > v3 > - add missing brackets around new goto > v2 > - switch to using our own variable > - add missing goto to skip sync in case of registration failure > --- > drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c > index 0b1e9337ee8e..27da5ba379c4 100644 > --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c > +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c > @@ -1124,7 +1124,7 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy, > struct rockchip_usb2phy_port *rport, > struct device_node *child_np) > { > - int ret; > + int ret, id; > > rport->port_id = USB2PHY_PORT_OTG; > rport->port_cfg = &rphy->phy_cfg->port_cfgs[USB2PHY_PORT_OTG]; > @@ -1163,12 +1163,15 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy, > ret = devm_extcon_register_notifier(rphy->dev, rphy->edev, > EXTCON_USB_HOST, &rport->event_nb); > if (ret) > + {
:-(
this is _not_ linux kernel code style!
Reminder: it always helps to run checkpatch
> dev_err(rphy->dev, "register USB HOST notifier failed\n"); > + goto out; > + } > > if (!of_property_read_bool(rphy->dev->of_node, "extcon")) { > /* do initial sync of usb state */ > - ret = property_enabled(rphy->grf, &rport->port_cfg->utmi_id); > - extcon_set_state_sync(rphy->edev, EXTCON_USB_HOST, !ret); > + id = property_enabled(rphy->grf, &rport->port_cfg->utmi_id); > + extcon_set_state_sync(rphy->edev, EXTCON_USB_HOST, !id); > } > } > > -- > 2.25.1
-- ~Vinod
| |