diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-14 18:09:04 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-14 18:09:04 +0000 |
| commit | 4f41964e046a17586c216f74f14bd97b3e5164c9 (patch) | |
| tree | e0f206d1e5be4b526336c4037e74f08f1fda39ac /drivers/usb/phy | |
| parent | 3251b2cdb9959eb46bd9b9fa9fb3c470eaf464b3 (diff) | |
| parent | 11a266d2e5e6b73bfba337fb3ef21c8fd4fa4150 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'drivers/usb/phy')
| -rw-r--r-- | drivers/usb/phy/phy.c | 3 |
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; } |