From: Breno Leitao Date: Thu, 26 Nov 2009 07:31:49 +0000 (+0000) Subject: bnx2: EEH is failing with timeout X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=529fab67d78747ddc3a8a2bbd0d1aab1d059439f;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git bnx2: EEH is failing with timeout bnx2 is failing when a PCI error is detected. The error is the following: bnx2: Chip not in correct endian mode bnx2: fw sync timeout, reset code = 404001d This error was caused because the way pci_restore_state() is working after commit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff ("PCI: Clear saved_state after the state has been restored"). Signed-off-by: Breno Leitao Acked-by: Michael Chan Signed-off-by: David S. Miller --- diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 08cddb6ff740..7fa4048b58d4 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -8264,6 +8264,7 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev) } pci_set_master(pdev); pci_restore_state(pdev); + pci_save_state(pdev); if (netif_running(dev)) { bnx2_set_power_state(bp, PCI_D0);