diff options
| author | James Bottomley | 2015-12-03 18:32:33 +0100 |
|---|---|---|
| committer | James Bottomley | 2015-12-03 18:32:33 +0100 |
| commit | be9e2f775f5a3147205c552534c3abf0f9374a13 (patch) | |
| tree | 9c10584796d73f80295d9c238a089f12621db316 /drivers/scsi/hpsa.c | |
| parent | Revert "scsi: Fix a bdi reregistration race" (diff) | |
| parent | mpt3sas: fix Kconfig dependency problem for mpt2sas back compatibility (diff) | |
| download | kernel-qcow2-linux-be9e2f775f5a3147205c552534c3abf0f9374a13.tar.gz kernel-qcow2-linux-be9e2f775f5a3147205c552534c3abf0f9374a13.tar.xz kernel-qcow2-linux-be9e2f775f5a3147205c552534c3abf0f9374a13.zip | |
Merge branch 'mkp-fixes' into fixes
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 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: |