diff options
| author | Xiaotian Feng <dfeng@redhat.com> | 2009-08-14 14:35:52 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-15 18:52:59 -0700 |
| commit | 68eac4602b9104cdaa6c18b3edd914cececa6a1e (patch) | |
| tree | b5ad0de0e84d59451933d358b05ddc582980df67 /drivers | |
| parent | 82776a4bcd7aa5fbcd2e6339b3ce88b727dd40ab (diff) | |
| download | blackbird-op-linux-68eac4602b9104cdaa6c18b3edd914cececa6a1e.tar.gz blackbird-op-linux-68eac4602b9104cdaa6c18b3edd914cececa6a1e.zip | |
e1000e: fix use of pci_enable_pcie_error_reporting
commit 111b9dc5 ("e1000e: add aer support") introduces pcie aer
support for e1000e, but it is not reasonable to disable it in
e1000_remove but enable it in e1000_resume. This patch enables aer
support in e1000_probe.
Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 58e22fcb22b5..fa92a683aefd 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -4670,14 +4670,6 @@ static int e1000_resume(struct pci_dev *pdev) return err; } - /* AER (Advanced Error Reporting) hooks */ - err = pci_enable_pcie_error_reporting(pdev); - if (err) { - dev_err(&pdev->dev, "pci_enable_pcie_error_reporting failed " - "0x%x\n", err); - /* non-fatal, continue */ - } - pci_set_master(pdev); pci_enable_wake(pdev, PCI_D3hot, 0); @@ -4990,6 +4982,14 @@ static int __devinit e1000_probe(struct pci_dev *pdev, if (err) goto err_pci_reg; + /* AER (Advanced Error Reporting) hooks */ + err = pci_enable_pcie_error_reporting(pdev); + if (err) { + dev_err(&pdev->dev, "pci_enable_pcie_error_reporting failed " + "0x%x\n", err); + /* non-fatal, continue */ + } + pci_set_master(pdev); /* PCI config space info */ err = pci_save_state(pdev); |
