xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes

Browse Source
This commit is contained in:
James Bottomley
2016-02-04 21:37:52 -08:00
parent 6344a5cd3e 0fb5b1fb30
commit 12ffbbe94d
8 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/sd.c
View File

@@ -761,7 +761,7 @@ static int sd_setup_discard_cmnd(struct scsi_cmnd *cmd)
break;
default:
ret = BLKPREP_KILL;
ret = BLKPREP_INVALID;
goto out;
}
@@ -839,7 +839,7 @@ static int sd_setup_write_same_cmnd(struct scsi_cmnd *cmd)
int ret;
if (sdkp->device->no_write_same)
return BLKPREP_KILL;
return BLKPREP_INVALID;
BUG_ON(bio_offset(bio) || bio_iovec(bio).bv_len != sdp->sector_size);