diff options
| author |   James Bottomley <JBottomley@Parallels.com> | 2014-12-08 07:40:20 -0800 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-12-08 07:40:20 -0800 |
| commit | dc843ef00e79ef0466d4d66bb20beeccda92e003 (patch) | |
| tree | 7491381fdd81b6d40b25fec533e6f249d7823ce3 /drivers/scsi/megaraid/megaraid_sas_base.c | |
| parent | Linux 3.18-rc7 (diff) | |
| parent | scsi: set fmt to NULL scsi_extd_sense_format() by default (diff) | |
| download | linux-dev-dc843ef00e79ef0466d4d66bb20beeccda92e003.tar.xz linux-dev-dc843ef00e79ef0466d4d66bb20beeccda92e003.zip | |
Merge remote-tracking branch 'scsi-queue/core-for-3.19' into for-linus
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_sas_base.c')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_base.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 5640ad1c8214..107244cebd22 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -2594,8 +2594,7 @@ static int megasas_change_queue_depth(struct scsi_device *sdev, if (queue_depth > sdev->host->can_queue) queue_depth = sdev->host->can_queue; - scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), - queue_depth); + scsi_adjust_queue_depth(sdev, queue_depth); return queue_depth; } |