[SCSI] megaraid_sas: Disable interrupts/free_irq() in megasas_shutdown()
authoradam radford <aradford@gmail.com>
Thu, 12 May 2011 01:34:17 +0000 (18:34 -0700)
committerJames Bottomley <jbottomley@parallels.com>
Tue, 24 May 2011 16:35:09 +0000 (12:35 -0400)
The following patch for megaraid_sas disables interrupts and
free_irq() in megasas_shutdown().

Signed-off-by: Adam Radford <aradford@gmail.com>
Signed-off-by: James Bottomley <jbottomley@parallels.com>
drivers/scsi/megaraid/megaraid_sas_base.c

index 19a55032218fbbaf709bf3068f2691dd26363884..a32b6ba0e9e5fe8d0dc4455a884f6568a0b7c266 100644 (file)
@@ -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);
 }
 
 /**