forked from Minki/linux
natsemi: Check return value for pci_enable_device()
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:
parent
0e5d5442cb
commit
a8a935dae5
@ -3314,13 +3314,19 @@ static int natsemi_resume (struct pci_dev *pdev)
|
||||
{
|
||||
struct net_device *dev = pci_get_drvdata (pdev);
|
||||
struct netdev_private *np = netdev_priv(dev);
|
||||
int ret = 0;
|
||||
|
||||
rtnl_lock();
|
||||
if (netif_device_present(dev))
|
||||
goto out;
|
||||
if (netif_running(dev)) {
|
||||
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); */
|
||||
|
||||
napi_enable(&np->napi);
|
||||
@ -3340,7 +3346,7 @@ static int natsemi_resume (struct pci_dev *pdev)
|
||||
netif_device_attach(dev);
|
||||
out:
|
||||
rtnl_unlock();
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_PM */
|
||||
|
Loading…
Reference in New Issue
Block a user