---

yaml --- r: 252415 b: refs/heads/master c: 46fd256 h: refs/heads/master i: 252413: d7a603d 252411: e9ed069 252407: 3bc4d8a 252399: 75876fa 252383: e8fa598 252351: 164657c 252287: b77843b 252159: 75a8dfb 251903: cf09b58 v: v3
git-mirror · May 24, 2011 · e5875fe · e5875fe
1 parent f7490f5
commit e5875fe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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);
 }
 
 /**