xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] Handle pci_enable_device() errors in resume

Browse Source 
Signed-off-by: Valerie Henson <val_henson@linux.intel.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Valerie Henson
2006-09-08 11:15:41 -07:00
committed by Jeff Garzik
parent 42eab56776
commit 9f486ae1d9
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/tulip/de2104x.c
View File

@@ -2138,17 +2138,21 @@ static int de_resume (struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata (pdev);
struct de_private *de = dev->priv;
int retval = 0;
rtnl_lock();
if (netif_device_present(dev))
goto out;
if (netif_running(dev)) {
pci_enable_device(pdev);
de_init_hw(de);
netif_device_attach(dev);
} else {
netif_device_attach(dev);
if (!netif_running(dev))
goto out_attach;
if ((retval = pci_enable_device(pdev))) {
printk (KERN_ERR "%s: pci_enable_device failed in resume\n",
dev->name);
goto out;
}
de_init_hw(de);
out_attach:
netif_device_attach(dev);
out:
rtnl_unlock();
return 0;