Commit 635cf17c authored Jul 08, 2014 by Russell King Committed by David S. Miller Jul 07, 2014

net: fec: remove checking for NULL phy_dev in fec_enet_close()



fep->phy_dev can not be NULL here for two reasons:
- fec_enet_open() will have successfully connected the phy, or will have
  failed.
- fec_enet_open() will have called phy_start(fep->phy_dev), which
  unconditionally dereferences this pointer.

If it were to be NULL here, then fec_enet_open() will have already
oopsed.

Acked-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent b49cd504

drivers/net/ethernet/freescale/fec_main.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -2184,10 +2184,8 @@ fec_enet_close(struct net_device *ndev)
		netif_tx_disable(ndev);
		fec_stop(ndev);

		if (fep->phy_dev) {
		phy_stop(fep->phy_dev);
		phy_disconnect(fep->phy_dev);
		}

		fec_enet_clk_enable(ndev, false);
		pinctrl_pm_select_sleep_state(&fep->pdev->dev);