Commit 68eac4602b9104cdaa6c18b3edd914cececa6a1e
Committed by
David S. Miller
David S. Miller
1 parent
82776a4bcd
Exists in
master
and in
20 other branches
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>
Showing 1 changed file with 8 additions and 8 deletions Side-by-side Diff
drivers/net/e1000e/netdev.c
| ... | ... | @@ -4670,14 +4670,6 @@ |
| 4670 | 4670 | return err; |
| 4671 | 4671 | } |
| 4672 | 4672 | |
| 4673 | - /* AER (Advanced Error Reporting) hooks */ | |
| 4674 | - err = pci_enable_pcie_error_reporting(pdev); | |
| 4675 | - if (err) { | |
| 4676 | - dev_err(&pdev->dev, "pci_enable_pcie_error_reporting failed " | |
| 4677 | - "0x%x\n", err); | |
| 4678 | - /* non-fatal, continue */ | |
| 4679 | - } | |
| 4680 | - | |
| 4681 | 4673 | pci_set_master(pdev); |
| 4682 | 4674 | |
| 4683 | 4675 | pci_enable_wake(pdev, PCI_D3hot, 0); |
| ... | ... | @@ -4989,6 +4981,14 @@ |
| 4989 | 4981 | e1000e_driver_name); |
| 4990 | 4982 | if (err) |
| 4991 | 4983 | goto err_pci_reg; |
| 4984 | + | |
| 4985 | + /* AER (Advanced Error Reporting) hooks */ | |
| 4986 | + err = pci_enable_pcie_error_reporting(pdev); | |
| 4987 | + if (err) { | |
| 4988 | + dev_err(&pdev->dev, "pci_enable_pcie_error_reporting failed " | |
| 4989 | + "0x%x\n", err); | |
| 4990 | + /* non-fatal, continue */ | |
| 4991 | + } | |
| 4992 | 4992 | |
| 4993 | 4993 | pci_set_master(pdev); |
| 4994 | 4994 | /* PCI config space info */ |