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/sym53c8xx_2 | |
| parent | 009d0431c3914de64666bec0d350e54fdd59df6a (diff) | |
| parent | 249b15ba6380830881b7863ca5dd3f33320adfdb (diff) | |
Merge remote-tracking branch 'scsi-queue/core-for-3.19' into for-linus
Diffstat (limited to 'drivers/scsi/sym53c8xx_2')
| -rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_glue.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c index e59e6f96b725..3557b385251a 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.c +++ b/drivers/scsi/sym53c8xx_2/sym_glue.c | |||
| @@ -820,9 +820,7 @@ static int sym53c8xx_slave_configure(struct scsi_device *sdev) | |||
| 820 | if (reqtags > SYM_CONF_MAX_TAG) | 820 | if (reqtags > SYM_CONF_MAX_TAG) |
| 821 | reqtags = SYM_CONF_MAX_TAG; | 821 | reqtags = SYM_CONF_MAX_TAG; |
| 822 | depth_to_use = reqtags ? reqtags : 1; | 822 | depth_to_use = reqtags ? reqtags : 1; |
| 823 | scsi_adjust_queue_depth(sdev, | 823 | scsi_adjust_queue_depth(sdev, depth_to_use); |
| 824 | sdev->tagged_supported ? MSG_SIMPLE_TAG : 0, | ||
| 825 | depth_to_use); | ||
| 826 | lp->s.scdev_depth = depth_to_use; | 824 | lp->s.scdev_depth = depth_to_use; |
| 827 | sym_tune_dev_queuing(tp, sdev->lun, reqtags); | 825 | sym_tune_dev_queuing(tp, sdev->lun, reqtags); |
| 828 | 826 | ||