From 9f486ae1d9ea700a952b77a8881de05ebc1610c3 Mon Sep 17 00:00:00 2001 From: Valerie Henson Date: Fri, 8 Sep 2006 11:15:41 -0700 Subject: [PATCH] Handle pci_enable_device() errors in resume Signed-off-by: Valerie Henson Cc: Jeff Garzik Signed-off-by: Jeff Garzik --- drivers/net/tulip/de2104x.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'drivers/net/tulip/de2104x.c') diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c index 350a73e99a8..17a2ebaef58 100644 --- a/drivers/net/tulip/de2104x.c +++ b/drivers/net/tulip/de2104x.c @@ -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; -- cgit v1.2.3