diff options
| author | Auke Kok <auke\-jan.h.kok@intel.com> | 2006-08-28 14:56:27 -0700 |
|---|---|---|
| committer | Auke Kok <juke-jan.h.kok@intel.com> | 2006-08-28 14:56:27 -0700 |
| commit | 3d1dd8cb23c30447602563fc8302af0f15fdf3a9 (patch) | |
| tree | 8bbecd1ced0fa8715f8701a2c5198f217cabe342 /drivers/net/e1000 | |
| parent | 3fbbc72ef172cd4272a43234d4c7a7bba44c97f5 (diff) | |
| download | linux-3.10-3d1dd8cb23c30447602563fc8302af0f15fdf3a9.tar.gz linux-3.10-3d1dd8cb23c30447602563fc8302af0f15fdf3a9.tar.bz2 linux-3.10-3d1dd8cb23c30447602563fc8302af0f15fdf3a9.zip | |
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 <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers/net/e1000')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 426811ad3e9..630fe605e5c 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); |