diff options
| author | James Bottomley | 2014-12-08 07:42:02 -0800 |
|---|---|---|
| committer | James Bottomley | 2014-12-08 07:42:25 -0800 |
| commit | 096cbc35eaecf5865a3274f21eae26955b32861b (patch) | |
| tree | 8c6f085fd648939bfbc6ae41cd3f0204e32c5e07 /drivers/scsi/scsi_sysfs.c | |
| parent | dc843ef00e79ef0466d4d66bb20beeccda92e003 (diff) | |
| parent | 79855d178557cc3e3ffd179fd26a64cef48dfb30 (diff) | |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
Conflicts:
drivers/scsi/scsi_debug.c
Agreed and tested resolution to a merge problem between a fix in scsi_debug
and a driver update
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/scsi_sysfs.c')
| -rw-r--r-- | drivers/scsi/scsi_sysfs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 35d93b0af82b..1cb64a8e18c9 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -877,11 +877,10 @@ sdev_store_queue_depth(struct device *dev, struct device_attribute *attr, depth = simple_strtoul(buf, NULL, 0); - if (depth < 1) + if (depth < 1 || depth > sht->can_queue) return -EINVAL; - retval = sht->change_queue_depth(sdev, depth, - SCSI_QDEPTH_DEFAULT); + retval = sht->change_queue_depth(sdev, depth); if (retval < 0) return retval; |