[PATCH 073/222] net:fec: remove checking for NULL phy_dev in fec_enet_close()
Russell King
rmk+kernel at arm.linux.org.uk
Fri Apr 25 04:37:10 PDT 2014
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.
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
---
drivers/net/ethernet/freescale/fec_main.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 875c0ca55c5a..b7a5614b874d 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1798,10 +1798,8 @@ fec_enet_close(struct net_device *ndev)
netif_stop_queue(ndev);
fec_stop(ndev);
- if (fep->phy_dev) {
- phy_stop(fep->phy_dev);
- phy_disconnect(fep->phy_dev);
- }
+ phy_stop(fep->phy_dev);
+ phy_disconnect(fep->phy_dev);
fec_enet_free_buffers(ndev);
--
1.8.3.1
More information about the linux-arm-kernel
mailing list