summaryrefslogtreecommitdiff
path: root/drivers/scsi/scsi_scan.c
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2015-05-18 10:50:43 -0700
committerBrian Norris <computersforpeace@gmail.com>2015-05-18 10:50:43 -0700
commit2ddd8db90a22fc4ac708cd8497ed5e46b7f24d49 (patch)
tree10924a4ec59c9b2d114c2287bd35e6debc72595f /drivers/scsi/scsi_scan.c
parent02787daadbdad80c9c79487b5ef8284aff734a7b (diff)
parente26081808edadfd257c6c9d81014e3b25e9a6118 (diff)
Merge tag 'v4.1-rc4' into MTD's -next
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
-rw-r--r--drivers/scsi/scsi_scan.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 60aae01caa89..6efab1c455e1 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -897,6 +897,12 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
*/
if (*bflags & BLIST_MAX_512)
blk_queue_max_hw_sectors(sdev->request_queue, 512);
+ /*
+ * Max 1024 sector transfer length for targets that report incorrect
+ * max/optimal lengths and relied on the old block layer safe default
+ */
+ else if (*bflags & BLIST_MAX_1024)
+ blk_queue_max_hw_sectors(sdev->request_queue, 1024);
/*
* Some devices may not want to have a start command automatically