summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorArjun Sreedharan <arjun024@gmail.com>2014-08-18 11:17:33 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-14 09:00:03 -0800
commitf259d867e35ffc1bd240d41c72278beec1faee33 (patch)
tree1ea87f1520d12d106b2a1f5704c26350c173334d /drivers
parent601fae783a931084634d70d6e1d327d4388c4e59 (diff)
usb: phy: return -ENODEV on failure of try_module_get
commit 2c4e3dbf63b39d44a291db70016c718f45d9cd46 upstream. When __usb_find_phy_dev() does not return error and try_module_get() fails, return -ENODEV. Signed-off-by: Arjun Sreedharan <arjun024@gmail.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Cc: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/phy/phy.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c
index 8afa813d690b..0180eef05656 100644
--- a/drivers/usb/phy/phy.c
+++ b/drivers/usb/phy/phy.c
@@ -229,6 +229,9 @@ struct usb_phy *usb_get_phy_dev(struct device *dev, u8 index)
phy = __usb_find_phy_dev(dev, &phy_bind_list, index);
if (IS_ERR(phy) || !try_module_get(phy->dev->driver->owner)) {
dev_dbg(dev, "unable to find transceiver\n");
+ if (!IS_ERR(phy))
+ phy = ERR_PTR(-ENODEV);
+
goto err0;
}