]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
net: xilinx_emacps: Don't disconnect phy in remove
authorPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Tue, 28 May 2013 02:13:34 +0000 (12:13 +1000)
committerMichal Simek <michal.simek@xilinx.com>
Wed, 5 Jun 2013 08:48:41 +0000 (10:48 +0200)
The phy is always connected in xemacps_open() so it should only
disconnect it in its cleanup counterpart xemapcs_close(). Remove
the extraneous phy_disconnect() in xemacps_remove accordingly.

Reported-by: Davor Joja <davorjoja@logicbricks.com>
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
drivers/net/ethernet/xilinx/xilinx_emacps.c

index 3a223d603cddccca09ad330a3f5ba9c712f74957..ceb0904596dedc5c35ce8835c0cbbdbd4425ab24 100644 (file)
@@ -2765,8 +2765,6 @@ static int __exit xemacps_remove(struct platform_device *pdev)
 
        if (ndev) {
                lp = netdev_priv(ndev);
-               if (lp->phy_dev)
-                       phy_disconnect(lp->phy_dev);
 
                mdiobus_unregister(lp->mii_bus);
                kfree(lp->mii_bus->irq);