From e5875fedb346d082f3b83c05ffb4745810dcb7f0 Mon Sep 17 00:00:00 2001
From: adam radford <aradford@gmail.com>
Date: Wed, 11 May 2011 18:34:17 -0700
Subject: [PATCH] --- yaml --- r: 252415 b: refs/heads/master c:
 46fd256e05581e4a04d5a8ec107d35afe938c65b h: refs/heads/master i:   252413:
 d7a603df53e4fad5f6f5351ea0219bf2b5f1f656   252411:
 e9ed069e8fb0fa120004cba8e0b469f73af59143   252407:
 3bc4d8aec260e80f225f5648562531447dba9b52   252399:
 75876faeab722194c9fe2652e48f070e74cbba04   252383:
 e8fa5981f1e33016af6e6fb895ab8ba41fe1e2bb   252351:
 164657cc162eaa22df49a414509ee6410a8bf196   252287:
 b77843bd9344a20584a563bca487c51758f19556   252159:
 75a8dfb29812be21d8acd6dd39046e4c59a31783   251903:
 cf09b58786132a68f0f916de43b7e625fce062c7 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/scsi/megaraid/megaraid_sas_base.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b20331546796..35e24b373417 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e70e7336515cd367b9cfcf5379e04808bdcbe96
+refs/heads/master: 46fd256e05581e4a04d5a8ec107d35afe938c65b
diff --git a/trunk/drivers/scsi/megaraid/megaraid_sas_base.c b/trunk/drivers/scsi/megaraid/megaraid_sas_base.c
index 19a55032218f..a32b6ba0e9e5 100644
--- a/trunk/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/trunk/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -4526,6 +4526,11 @@ static void megasas_shutdown(struct pci_dev *pdev)
 	instance->unload = 1;
 	megasas_flush_cache(instance);
 	megasas_shutdown_controller(instance, MR_DCMD_CTRL_SHUTDOWN);
+	instance->instancet->disable_intr(instance->reg_set);
+	free_irq(instance->msi_flag ? instance->msixentry.vector :
+		 instance->pdev->irq, instance);
+	if (instance->msi_flag)
+		pci_disable_msix(instance->pdev);
 }
 
 /**