X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=drivers%2Fmessage%2Ffusion%2Fmptbase.c;h=75e599b85b645aba6d4de501f7f6c22e01dfa825;hb=89a93f2f4834f8c126e8d9dd6b368d0b9e21ec3d;hp=9bc35617b8719beb84b8acf542fd79754c4eca98;hpb=fe9233fb6914a0eb20166c967e3020f7f0fba2c9;p=linux-2.6-block.git diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 9bc35617b871..75e599b85b64 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c @@ -1751,9 +1751,14 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) ioc->bus_type = SAS; } - if (ioc->bus_type == SAS && mpt_msi_enable == -1) - ioc->msi_enable = 1; - else + if (mpt_msi_enable == -1) { + /* Enable on SAS, disable on FC and SPI */ + if (ioc->bus_type == SAS) + ioc->msi_enable = 1; + else + ioc->msi_enable = 0; + } else + /* follow flag: 0 - disable; 1 - enable */ ioc->msi_enable = mpt_msi_enable; if (ioc->errata_flag_1064)