redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
James Bottomley 2016-01-26 17:44:42 -08:00
parent 13b4389143 d0eb20a863
commit 6344a5cd3e
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/scsi/hisi_sas/Kconfig
View file

@ -1,5 +1,7 @@
config SCSI_HISI_SAS config SCSI_HISI_SAS
tristate "HiSilicon SAS" tristate "HiSilicon SAS"
depends on HAS_DMA
depends on ARM64 || COMPILE_TEST
select SCSI_SAS_LIBSAS select SCSI_SAS_LIBSAS
select BLK_DEV_INTEGRITY select BLK_DEV_INTEGRITY
help help

2
drivers/scsi/sd.c
View file

@ -2893,7 +2893,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
sdkp->opt_xfer_blocks <= SD_DEF_XFER_BLOCKS && sdkp->opt_xfer_blocks <= SD_DEF_XFER_BLOCKS &&
sdkp->opt_xfer_blocks * sdp->sector_size >= PAGE_CACHE_SIZE) sdkp->opt_xfer_blocks * sdp->sector_size >= PAGE_CACHE_SIZE)
rw_max = q->limits.io_opt = rw_max = q->limits.io_opt =
logical_to_sectors(sdp, sdkp->opt_xfer_blocks); sdkp->opt_xfer_blocks * sdp->sector_size;
else else
rw_max = BLK_DEF_MAX_SECTORS; rw_max = BLK_DEF_MAX_SECTORS;