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

natsemi: Check return value for pci_enable_device()

Browse Source 
pci_enable_device() is __must_check so do that in natsemi_resume().

Signed-off-by: Mark Brown <broonie@sirena.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Mark Brown
2007-10-10 17:11:12 +01:00
committed by Jeff Garzik
parent 0e5d5442cb
commit a8a935dae5
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/natsemi.c
View File

@@ -3314,13 +3314,19 @@ static int natsemi_resume (struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata (pdev); struct net_device *dev = pci_get_drvdata (pdev);
struct netdev_private *np = netdev_priv(dev); struct netdev_private *np = netdev_priv(dev);
int ret = 0;
rtnl_lock(); rtnl_lock();
if (netif_device_present(dev)) if (netif_device_present(dev))
goto out; goto out;
if (netif_running(dev)) { if (netif_running(dev)) {
BUG_ON(!np->hands_off); BUG_ON(!np->hands_off);
pci_enable_device(pdev); ret = pci_enable_device(pdev);
if (ret < 0) {
dev_err(&pdev->dev,
"pci_enable_device() failed: %d\n", ret);
goto out;
}
/* pci_power_on(pdev); */ /* pci_power_on(pdev); */
napi_enable(&np->napi); napi_enable(&np->napi);
@@ -3340,7 +3346,7 @@ static int natsemi_resume (struct pci_dev *pdev)
netif_device_attach(dev); netif_device_attach(dev);
out: out:
rtnl_unlock(); rtnl_unlock();
return 0; return ret;
} }
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */