aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2008-03-30 11:38:07 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-04-07 12:19:02 -0500
commitb8e3d3aeabe3be471e448ff5e51b6e57b5819913 (patch)
tree29ca30ed7bf0b152fe5781e97ec49d3eb93f1aeb
parent53df8ba801b835ebbd116b4585adfe7ce4efd2b3 (diff)
[SCSI] mpt fusion: fix up msi_enable in mpt_suspend
There's a problem with the combination of the upstream power management fixes and the enabling of MSI by default in that the suspend path still uses the global variable. Convert it to check ioc->msi_enable. Cc: "Moore, Eric" <Eric.Moore@lsi.com> Cc: "Prakash, Sathya" <sathya.prakash@lsi.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r--drivers/message/fusion/mptbase.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index a34ddc7bce8..db3c892f87f 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1836,7 +1836,7 @@ mpt_suspend(struct pci_dev *pdev, pm_message_t state)
CHIPREG_WRITE32(&ioc->chip->IntStatus, 0);
free_irq(ioc->pci_irq, ioc);
- if (mpt_msi_enable)
+ if (ioc->msi_enable)
pci_disable_msi(ioc->pcidev);
ioc->pci_irq = -1;
pci_save_state(pdev);