projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-next-4.5' of git://people.freedesktop.org/~agd5f/linux into drm...
[cascardo/linux.git]
/
drivers
/
scsi
/
hpsa.c
diff --git
a/drivers/scsi/hpsa.c
b/drivers/scsi/hpsa.c
index
6a8f958
..
a386036
100644
(file)
--- 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: