2 files changed, 10 insertions, 4 deletions

diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index 19f7ee63276f..94b47c8d0ab4 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -289,9 +289,13 @@ static int fixed_mdio_register_device(int number, int speed, int duplex)
                 goto probe_fail;
         }
 
-        device_bind_driver(&phydev->dev);
+        err = device_bind_driver(&phydev->dev);
+
         up_write(&phydev->dev.bus->subsys.rwsem);
 
+        if (err)
+                goto probe_fail;
+
         return 0;
 
 probe_fail:
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index ecd3da151e2d..3bbd5e70c209 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -212,11 +212,13 @@ struct phy_device *phy_attach(struct net_device *dev,
 
                 err = d->driver->probe(d);
 
-                if (err < 0)
-                        return ERR_PTR(err);
+                if (err >= 0)
+                        err = device_bind_driver(d);
 
-                device_bind_driver(d);
                 up_write(&d->bus->subsys.rwsem);
+
+                if (err)
+                        return ERR_PTR(err);
         }
 
         if (phydev->attached_dev) {