diff options
author | James Bottomley <JBottomley@Parallels.com> | 2014-12-08 16:40:20 +0100 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2014-12-08 16:40:20 +0100 |
commit | dc843ef00e79ef0466d4d66bb20beeccda92e003 (patch) | |
tree | 7491381fdd81b6d40b25fec533e6f249d7823ce3 /drivers/scsi/arcmsr/arcmsr_hba.c | |
parent | Linux 3.18-rc7 (diff) | |
parent | scsi: set fmt to NULL scsi_extd_sense_format() by default (diff) | |
download | linux-dc843ef00e79ef0466d4d66bb20beeccda92e003.tar.xz linux-dc843ef00e79ef0466d4d66bb20beeccda92e003.zip |
Merge remote-tracking branch 'scsi-queue/core-for-3.19' into for-linus
Diffstat (limited to 'drivers/scsi/arcmsr/arcmsr_hba.c')
-rw-r--r-- | drivers/scsi/arcmsr/arcmsr_hba.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c index 0b44fb5ee485..209f77162d06 100644 --- a/drivers/scsi/arcmsr/arcmsr_hba.c +++ b/drivers/scsi/arcmsr/arcmsr_hba.c @@ -122,7 +122,7 @@ static int arcmsr_adjust_disk_queue_depth(struct scsi_device *sdev, if (queue_depth > ARCMSR_MAX_CMD_PERLUN) queue_depth = ARCMSR_MAX_CMD_PERLUN; - scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, queue_depth); + scsi_adjust_queue_depth(sdev, queue_depth); return queue_depth; } |