aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/phy/phy_device.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/phy/phy_device.c')
-rw-r--r--drivers/net/phy/phy_device.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index f320f466f03b..e8c42d6a7d1c 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -915,9 +915,7 @@ static int phy_probe(struct device *dev)
915 915
916 phydev = to_phy_device(dev); 916 phydev = to_phy_device(dev);
917 917
918 /* Make sure the driver is held. 918 drv = phydev->dev.driver;
919 * XXX -- Is this correct? */
920 drv = get_driver(phydev->dev.driver);
921 phydrv = to_phy_driver(drv); 919 phydrv = to_phy_driver(drv);
922 phydev->drv = phydrv; 920 phydev->drv = phydrv;
923 921
@@ -957,8 +955,6 @@ static int phy_remove(struct device *dev)
957 955
958 if (phydev->drv->remove) 956 if (phydev->drv->remove)
959 phydev->drv->remove(phydev); 957 phydev->drv->remove(phydev);
960
961 put_driver(dev->driver);
962 phydev->drv = NULL; 958 phydev->drv = NULL;
963 959
964 return 0; 960 return 0;