Merge 3.15-rc3 into staging-next

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c
index 8afa813d690b..36b6bce33b20 100644
--- a/drivers/usb/phy/phy.c
+++ b/drivers/usb/phy/phy.c
@@ -132,6 +132,9 @@ struct usb_phy *usb_get_phy(enum usb_phy_type type)
         if (IS_ERR(phy) || !try_module_get(phy->dev->driver->owner)) {
                 pr_debug("PHY: unable to find transceiver of type %s\n",
                         usb_phy_type_string(type));
+                if (!IS_ERR(phy))
+                        phy = ERR_PTR(-ENODEV);
+
                 goto err0;
         }