From 57b8837b4eb3b4972390680ad8042cd6920bf003 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Wed, 18 Jun 2008 15:31:48 -0700
Subject: 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.
---
 linux-core/i915_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core')

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)
-- 
cgit v1.2.3