From 0a10d70ef2bec46aaf7c2c8b5c3db328ed8eeb24 Mon Sep 17 00:00:00 2001 From: Breno Leitao Date: Tue, 10 Nov 2009 08:37:47 +0000 Subject: [PATCH] --- yaml --- r: 168759 b: refs/heads/master c: c0e1f68bce454d244e2eea6b0ab7b3a217c673d2 h: refs/heads/master i: 168757: c6d0e1d5d0b018b6865505794f45b72f65ef8f2b 168755: 48c7a8233682c8a5147da52be7db1edd1501265a 168751: 1f8f32d79ef8e2a6a67dcafe0dec3e3ccc3b3402 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7bb52e4eab9e..7d8a83ac739e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8494347eedd2facf474021c615d1d07c62e04afd +refs/heads/master: c0e1f68bce454d244e2eea6b0ab7b3a217c673d2 diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c index 5bd9e6bf6f2f..a5036f7c1923 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ixgbe/ixgbe_main.c @@ -5994,6 +5994,7 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev) } else { pci_set_master(pdev); pci_restore_state(pdev); + pci_save_state(pdev); pci_wake_from_d3(pdev, false);