On Thu, Nov 20, 2014 at 09:23:36PM +0530, Arjun Sreedharan wrote: > When __of_usb_find_phy() fails, it returns -ENODEV - its > error code has to be returned by devm_usb_get_phy_by_phandle(). > Only when the former function succeeds and try_module_get() > fails should -EPROBE_DEFER be returned. > > Signed-off-by: Arjun Sreedharan <arjun024@xxxxxxxxx> > --- > drivers/usb/phy/phy.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c > index 045cd30..0310112 100644 > --- a/drivers/usb/phy/phy.c > +++ b/drivers/usb/phy/phy.c > @@ -191,7 +191,9 @@ struct usb_phy *devm_usb_get_phy_by_phandle(struct device *dev, > > phy = __of_usb_find_phy(node); > if (IS_ERR(phy) || !try_module_get(phy->dev->driver->owner)) { > - phy = ERR_PTR(-EPROBE_DEFER); > + if (!IS_ERR(phy)) > + phy = ERR_PTR(-EPROBE_DEFER); > + trailing whitespace here. I'll fix it myself this time, but next time be more careful. cheers -- balbi
Attachment:
signature.asc
Description: Digital signature