diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2017-02-10 08:00:46 +0300 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2017-02-10 08:00:46 +0300 |
| commit | ed6de4560ad2f7578be3a9ca1364e268c641f3a7 (patch) | |
| tree | ef2fa19e0c9efba4791dff9e5a1d7854e2b62184 /drivers/scsi/aacraid | |
| parent | ad3efdb72cd921ec52ac94e82595a5d2e7a7b054 (diff) | |
| parent | 2dfa6688aafdc3f74efeb1cf05fb871465d67f79 (diff) | |
| download | linux-ed6de4560ad2f7578be3a9ca1364e268c641f3a7.tar.xz | |
Merge remote-tracking branch 'mkp-scsi/4.10/scsi-fixes' into fixes
Diffstat (limited to 'drivers/scsi/aacraid')
| -rw-r--r-- | drivers/scsi/aacraid/comminit.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c index 4f56b1003cc7..5b48bedd7c38 100644 --- a/drivers/scsi/aacraid/comminit.c +++ b/drivers/scsi/aacraid/comminit.c @@ -50,9 +50,13 @@ struct aac_common aac_config = { static inline int aac_is_msix_mode(struct aac_dev *dev) { - u32 status; + u32 status = 0; - status = src_readl(dev, MUnit.OMR); + if (dev->pdev->device == PMC_DEVICE_S6 || + dev->pdev->device == PMC_DEVICE_S7 || + dev->pdev->device == PMC_DEVICE_S8) { + status = src_readl(dev, MUnit.OMR); + } return (status & AAC_INT_MODE_MSIX); } |