[PATCH] Unset msi and msix flags on pci_device_disable

[Thomas Meyer]

The commit f5f2b13129a6541debf8851bae843cbbf48298b7 broke suspend/resume
to disk two or more  times in a row. This patches fixes the problem:

This patch should be included in 2.6.21

Signed-off-by: Thomas Meyer <thomas@xxxxxxxx>

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index d3eab05..d7f8f96 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -886,7 +886,9 @@ pci_disable_device(struct pci_dev *dev)
         pci_write_config_word(dev, PCI_COMMAND, pci_command);
     }
     dev->is_busmaster = 0;
-
+    dev->msi_enabled=0;
+    dev->msix_enabled=0;
+   
     pcibios_disable_device(dev);
 }
 


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/