From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Sun, 30 Mar 2008 16:38:07 +0000 (-0500)
Subject: [SCSI] mpt fusion: fix up msi_enable in mpt_suspend
X-Git-Tag: v2.6.26-rc1~1140^2~82
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b8e3d3aeabe3be471e448ff5e51b6e57b5819913;p=linux-2.6-omap-h63xx.git

[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>
---

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);