diff options
author | James Bottomley <JBottomley@Odin.com> | 2015-11-12 07:06:18 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Odin.com> | 2015-11-12 07:06:18 -0500 |
commit | febdfbd2137a5727f70dfbf920105c07e6c2a21e (patch) | |
tree | 9483a5493ad3e08626e1f53ded594f88a6f4e710 /drivers/scsi/sd.c | |
parent | 0da39687a15403251bdfd1c6fb18025c0607326b (diff) | |
parent | 2c5d16d6a9e7218e57b716e4fd9d77c776d21471 (diff) |
Merge tag '4.4-scsi-mkp' into misc
SCSI queue for 4.4.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/sd.c')
-rw-r--r-- | drivers/scsi/sd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 3f370228bf31..f7247778c225 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -204,6 +204,7 @@ cache_type_store(struct device *dev, struct device_attribute *attr, buffer_data[2] &= ~0x05; buffer_data[2] |= wce << 2 | rcd; sp = buffer_data[0] & 0x80 ? 1 : 0; + buffer_data[0] &= ~0x80; if (scsi_mode_select(sdp, 1, sp, 8, buffer_data, len, SD_TIMEOUT, SD_MAX_RETRIES, &data, &sshdr)) { |