diff options
author | Auke Kok <auke\-jan.h.kok@intel.com> | 2006-08-28 17:56:27 -0400 |
---|---|---|
committer | Auke Kok <juke-jan.h.kok@intel.com> | 2006-08-28 17:56:27 -0400 |
commit | 3d1dd8cb23c30447602563fc8302af0f15fdf3a9 (patch) | |
tree | 8bbecd1ced0fa8715f8701a2c5198f217cabe342 /drivers/net | |
parent | 3fbbc72ef172cd4272a43234d4c7a7bba44c97f5 (diff) |
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')
-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 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) | |||
4709 | { | 4709 | { |
4710 | struct net_device *netdev = pci_get_drvdata(pdev); | 4710 | struct net_device *netdev = pci_get_drvdata(pdev); |
4711 | struct e1000_adapter *adapter = netdev_priv(netdev); | 4711 | struct e1000_adapter *adapter = netdev_priv(netdev); |
4712 | uint32_t manc, ret_val; | 4712 | uint32_t manc, err; |
4713 | 4713 | ||
4714 | pci_set_power_state(pdev, PCI_D0); | 4714 | pci_set_power_state(pdev, PCI_D0); |
4715 | e1000_pci_restore_state(adapter); | 4715 | e1000_pci_restore_state(adapter); |
4716 | ret_val = pci_enable_device(pdev); | 4716 | if ((err = pci_enable_device(pdev))) { |
4717 | printk(KERN_ERR "e1000: Cannot enable PCI device from suspend\n"); | ||
4718 | return err; | ||
4719 | } | ||
4717 | pci_set_master(pdev); | 4720 | pci_set_master(pdev); |
4718 | 4721 | ||
4719 | pci_enable_wake(pdev, PCI_D3hot, 0); | 4722 | pci_enable_wake(pdev, PCI_D3hot, 0); |