Merge tag 'for-v3.5' of git://git.infradead.org/battery-2.6

[~andy/linux] / drivers / pci / pci-driver.c

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 6b54b23b990be0be03dddb49f5e02b55e5272c56..bf0cee629b60f8bb763b4407f631e7ba7e778aa8 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -420,6 +420,12 @@ static void pci_device_shutdown(struct device *dev)
        pci_msi_shutdown(pci_dev);
        pci_msix_shutdown(pci_dev);
 
+       /*
+        * Turn off Bus Master bit on the device to tell it to not
+        * continue to do DMA
+        */
+       pci_disable_device(pci_dev);
+
        /*
         * Devices may be enabled to wake up by runtime PM, but they need not
         * be supposed to wake up the system from its "power off" state (e.g.