lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/fec: no need to check for validity of ndev in suspend and resume

Browse Source 
dev_set_drvdata is called unconditionally in the probe function and so
it cannot be NULL.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
This commit is contained in:
Uwe Kleine-König
2011-01-13 21:53:40 +01:00
parent b2b09ad63c
commit 04e5216d44
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/fec.c
View File

@@ -1492,16 +1492,14 @@ static int
fec_suspend(struct device *dev) fec_suspend(struct device *dev)
{ {
struct net_device *ndev = dev_get_drvdata(dev); struct net_device *ndev = dev_get_drvdata(dev);
struct fec_enet_private *fep; struct fec_enet_private *fep = netdev_priv(ndev);
if (ndev) { if (netif_running(ndev)) {
fep = netdev_priv(ndev); fec_stop(ndev);
if (netif_running(ndev)) { netif_device_detach(ndev);
fec_stop(ndev);
netif_device_detach(ndev);
}
clk_disable(fep->clk);
} }
clk_disable(fep->clk);
return 0; return 0;
} }
@@ -1509,16 +1507,14 @@ static int
fec_resume(struct device *dev) fec_resume(struct device *dev)
{ {
struct net_device *ndev = dev_get_drvdata(dev); struct net_device *ndev = dev_get_drvdata(dev);
struct fec_enet_private *fep; struct fec_enet_private *fep = netdev_priv(ndev);
if (ndev) { clk_enable(fep->clk);
fep = netdev_priv(ndev); if (netif_running(ndev)) {
clk_enable(fep->clk); fec_restart(ndev, fep->full_duplex);
if (netif_running(ndev)) { netif_device_attach(ndev);
fec_restart(ndev, fep->full_duplex);
netif_device_attach(ndev);
}
} }
return 0; return 0;
} }