summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/hpsa.c
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2015-12-03 18:32:33 +0100
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2015-12-03 18:32:33 +0100
commitbe9e2f775f5a3147205c552534c3abf0f9374a13 (patch)
tree9c10584796d73f80295d9c238a089f12621db316 /drivers/scsi/hpsa.c
parentRevert "scsi: Fix a bdi reregistration race" (diff)
parentmpt3sas: fix Kconfig dependency problem for mpt2sas back compatibility (diff)
downloadlinux-be9e2f775f5a3147205c552534c3abf0f9374a13.tar.xz
linux-be9e2f775f5a3147205c552534c3abf0f9374a13.zip
Merge branch 'mkp-fixes' into fixes
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 6a8f95808ee0..a3860367b568 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -8671,7 +8671,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: