i915: cleanup PCI state before disabling MSI
authorJesse Barnes <jbarnes@jbarnes-t61.(none)>
Wed, 18 Jun 2008 22:31:48 +0000 (15:31 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Wed, 18 Jun 2008 22:31:48 +0000 (15:31 -0700)
Core MSI code will BUG() if an interrupt handler is still registered when
pci_disable_msi() is called.

linux-core/i915_drv.c

index 1817c96..2b8ee77 100644 (file)
@@ -656,9 +656,9 @@ static int probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 }
 static void remove(struct pci_dev *pdev)
 {
+       drm_cleanup_pci(pdev);
        if (pdev->msi_enabled)
                pci_disable_msi(pdev);
-       drm_cleanup_pci(pdev);
 }
 
 static int __init i915_init(void)