diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-01-08 00:51:13 +0100 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-01-08 00:51:13 +0100 |
commit | abaee091a18c19ccd86feb1c8374585d82e96777 (patch) | |
tree | 01602bae73e1278c3d98dafe1c269049927c58ce /drivers/scsi/hpsa.c | |
parent | cxlflash: Enable device id for future IBM CXL adapter (diff) | |
parent | ses: fix discovery of SATA devices in SAS enclosures (diff) | |
download | linux-abaee091a18c19ccd86feb1c8374585d82e96777.tar.xz linux-abaee091a18c19ccd86feb1c8374585d82e96777.zip |
Merge branch 'jejb-scsi' into misc
Diffstat (limited to 'drivers/scsi/hpsa.c')
-rw-r--r-- | drivers/scsi/hpsa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 17a39761b05d..38ce0e308fbe 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -8764,7 +8764,7 @@ static void hpsa_disable_rld_caching(struct ctlr_info *h) if ((rc != 0) || (c->err_info->CommandStatus != 0)) goto errout; - if (*options && HPSA_DIAG_OPTS_DISABLE_RLD_CACHING) + if (*options & HPSA_DIAG_OPTS_DISABLE_RLD_CACHING) goto out; errout: |