Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68eac460 authored by Xiaotian Feng's avatar Xiaotian Feng Committed by David S. Miller
Browse files

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: default avatarXiaotian Feng <dfeng@redhat.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 82776a4b

drivers/net/e1000e/netdev.c

+8 −8
Original line number Diff line number Diff line
@@ -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);