Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6344a5cd authored by James Bottomley's avatar James Bottomley
Browse files

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

parents 13b43891 d0eb20a8

drivers/scsi/hisi_sas/Kconfig

+2 −0
Original line number Diff line number Diff line 
config SCSI_HISI_SAS

	tristate "HiSilicon SAS"

	depends on HAS_DMA

	depends on ARM64 || COMPILE_TEST

	select SCSI_SAS_LIBSAS

	select BLK_DEV_INTEGRITY

	help

drivers/scsi/sd.c

+1 −1
Original line number Diff line number Diff line
@@ -2893,7 +2893,7 @@ static int sd_revalidate_disk(struct gendisk *disk) 
	    sdkp->opt_xfer_blocks <= SD_DEF_XFER_BLOCKS &&

	    sdkp->opt_xfer_blocks * sdp->sector_size >= PAGE_CACHE_SIZE)

		rw_max = q->limits.io_opt =

			logical_to_sectors(sdp, sdkp->opt_xfer_blocks);

			sdkp->opt_xfer_blocks * sdp->sector_size;

	else

		rw_max = BLK_DEF_MAX_SECTORS;