summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/hpsa.c
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2016-01-08 00:51:13 +0100
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2016-01-08 00:51:13 +0100
commitabaee091a18c19ccd86feb1c8374585d82e96777 (patch)
tree01602bae73e1278c3d98dafe1c269049927c58ce /drivers/scsi/hpsa.c
parentcxlflash: Enable device id for future IBM CXL adapter (diff)
parentses: fix discovery of SATA devices in SAS enclosures (diff)
downloadlinux-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.c2
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: