1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 71592ed2e686..3e53ca723435 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -3439,13 +3439,18 @@ static int e1000_test_msi(struct e1000_adapter *adapter)
 
         /* disable SERR in case the MSI write causes a master abort */
         pci_read_config_word(adapter->pdev, PCI_COMMAND, &pci_cmd);
-        pci_write_config_word(adapter->pdev, PCI_COMMAND,
-                              pci_cmd & ~PCI_COMMAND_SERR);
+        if (pci_cmd & PCI_COMMAND_SERR)
+                pci_write_config_word(adapter->pdev, PCI_COMMAND,
+                                      pci_cmd & ~PCI_COMMAND_SERR);
 
         err = e1000_test_msi_interrupt(adapter);
 
-        /* restore previous setting of command word */
-        pci_write_config_word(adapter->pdev, PCI_COMMAND, pci_cmd);
+        /* re-enable SERR */
+        if (pci_cmd & PCI_COMMAND_SERR) {
+                pci_read_config_word(adapter->pdev, PCI_COMMAND, &pci_cmd);
+                pci_cmd |= PCI_COMMAND_SERR;
+                pci_write_config_word(adapter->pdev, PCI_COMMAND, pci_cmd);
+        }
 
         /* success ! */
         if (!err)