diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2019-02-04 14:53:42 -0700 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2019-02-04 14:53:42 -0700 |
| commit | 6a8a2aa62da2fbe51f5449993fd366398048f465 (patch) | |
| tree | 566c6fcc782eefbca054af8553371d09b9d0734c /drivers/scsi/megaraid/megaraid_sas_fusion.c | |
| parent | a163afc88556e099271a7b423295bc5176fcecce (diff) | |
| parent | 8834f5600cf3c8db365e18a3d5cac2c2780c81e5 (diff) | |
Merge tag 'v5.0-rc5' into rdma.git for-next
Linux 5.0-rc5
Needed to merge the include/uapi changes so we have an up to date
single-tree for these files. Patches already posted are also expected to
need this for dependencies.
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_sas_fusion.c')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c index a9a25f0eaf6f..647f48a28f85 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -175,7 +175,8 @@ megasas_clear_intr_fusion(struct megasas_instance *instance) /* * Check if it is our interrupt */ - status = readl(®s->outbound_intr_status); + status = megasas_readl(instance, + ®s->outbound_intr_status); if (status & 1) { writel(status, ®s->outbound_intr_status); |