summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@jbarnes-t61.(none)>2008-06-18 15:31:48 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-06-18 15:31:48 -0700
commit57b8837b4eb3b4972390680ad8042cd6920bf003 (patch)
tree50448f5e0fd2d416a74333773f609b70f3c6e9c9
parent86accbcb344ff25fbb47a788bb0f7464b5cd797f (diff)
i915: cleanup PCI state before disabling MSI
Core MSI code will BUG() if an interrupt handler is still registered when pci_disable_msi() is called.
-rw-r--r--linux-core/i915_drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index 1817c964..2b8ee774 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -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)