Commit 1290a958 authored Nov 20, 2014 by Arjun Sreedharan Committed by Felipe Balbi Nov 20, 2014

usb: phy: propagate __of_usb_find_phy()'s error on failure



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.

[ balbi@ti.com : remove trailing whitespace ]

Signed-off-by: Arjun Sreedharan <arjun024@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

parent 62c60697

drivers/usb/phy/phy.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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)) {
		if (!IS_ERR(phy))
		phy = ERR_PTR(-EPROBE_DEFER);

		devres_free(ptr);
		goto err1;
		}

Admin message