Messages in this thread | | | Date | Wed, 12 Aug 2009 21:54:39 -0700 | Subject | Re: [PATCH] e1000e: fix use of pci_enable_pcie_error_reporting | From | Jeff Kirsher <> |
| |
On Fri, Aug 7, 2009 at 02:36, Xiaotian Feng<dfeng@redhat.com> wrote: > commit 111b9dc5 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> > --- > 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 63415bb..e2f0304 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); > -- > 1.6.2.5 > > --
I have added this to my tree for testing. Sorry I did not respond earlier.
Dave - I will make sure that the tabs/whitespace is correct.
-- Cheers, Jeff -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |