From 0e0ab3476881855d2f263b98a16f03735816742b Mon Sep 17 00:00:00 2001 From: Wendy Xiong Date: Wed, 23 Apr 2008 11:09:29 -0700 Subject: [PATCH] --- yaml --- r: 93101 b: refs/heads/master c: aad32739641d3a75818fbe653d4b0d530e965f2f h: refs/heads/master i: 93099: 27c403098776e70e35b147e12d348a5a6bac3c6a v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/netdev.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c5161cb60173..3264f137244d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb3b27bc00ca2b6d69c3a22ff43b4d95fef47bed +refs/heads/master: aad32739641d3a75818fbe653d4b0d530e965f2f diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c index 9d1143aa6189..603ef9a6ddc1 100644 --- a/trunk/drivers/net/e1000e/netdev.c +++ b/trunk/drivers/net/e1000e/netdev.c @@ -3807,6 +3807,7 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev) return PCI_ERS_RESULT_DISCONNECT; } pci_set_master(pdev); + pci_restore_state(pdev); pci_enable_wake(pdev, PCI_D3hot, 0); pci_enable_wake(pdev, PCI_D3cold, 0); @@ -3933,6 +3934,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, goto err_pci_reg; pci_set_master(pdev); + pci_save_state(pdev); err = -ENOMEM; netdev = alloc_etherdev(sizeof(struct e1000_adapter));