From 3d1dd8cb23c30447602563fc8302af0f15fdf3a9 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Mon, 28 Aug 2006 14:56:27 -0700 Subject: [PATCH] e1000: error out if we cannot enable PCI device on resume Do not ignore errors returned by pci_enable_device, instead error out. Signed-off-by: Auke Kok --- drivers/net/e1000/e1000_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 426811ad3e9b..630fe605e5c4 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -4709,11 +4709,14 @@ e1000_resume(struct pci_dev *pdev) { struct net_device *netdev = pci_get_drvdata(pdev); struct e1000_adapter *adapter = netdev_priv(netdev); - uint32_t manc, ret_val; + uint32_t manc, err; pci_set_power_state(pdev, PCI_D0); e1000_pci_restore_state(adapter); - ret_val = pci_enable_device(pdev); + if ((err = pci_enable_device(pdev))) { + printk(KERN_ERR "e1000: Cannot enable PCI device from suspend\n"); + return err; + } pci_set_master(pdev); pci_enable_wake(pdev, PCI_D3hot, 0); -- 2.34.1