diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-12-08 10:40:20 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-12-08 10:40:20 -0500 |
| commit | dc843ef00e79ef0466d4d66bb20beeccda92e003 (patch) | |
| tree | 7491381fdd81b6d40b25fec533e6f249d7823ce3 /drivers/scsi/hptiop.c | |
| parent | 009d0431c3914de64666bec0d350e54fdd59df6a (diff) | |
| parent | 249b15ba6380830881b7863ca5dd3f33320adfdb (diff) | |
Merge remote-tracking branch 'scsi-queue/core-for-3.19' into for-linus
Diffstat (limited to 'drivers/scsi/hptiop.c')
| -rw-r--r-- | drivers/scsi/hptiop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c index dedb62c21b29..151893148abd 100644 --- a/drivers/scsi/hptiop.c +++ b/drivers/scsi/hptiop.c | |||
| @@ -1127,7 +1127,7 @@ static int hptiop_adjust_disk_queue_depth(struct scsi_device *sdev, | |||
| 1127 | 1127 | ||
| 1128 | if (queue_depth > hba->max_requests) | 1128 | if (queue_depth > hba->max_requests) |
| 1129 | queue_depth = hba->max_requests; | 1129 | queue_depth = hba->max_requests; |
| 1130 | scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, queue_depth); | 1130 | scsi_adjust_queue_depth(sdev, queue_depth); |
| 1131 | return queue_depth; | 1131 | return queue_depth; |
| 1132 | } | 1132 | } |
| 1133 | 1133 | ||