Merge tag 'pinctrl-v3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[cascardo/linux.git] / drivers / scsi / advansys.c

diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 43761c1..6719a33 100644 (file)
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -7706,7 +7706,7 @@ advansys_narrow_slave_configure(struct scsi_device *sdev, ASC_DVC_VAR *asc_dvc)
                                asc_dvc->cfg->can_tagged_qng |= tid_bit;
                                asc_dvc->use_tagged_qng |= tid_bit;
                        }
-                       scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG,
+                       scsi_change_queue_depth(sdev, 
                                                asc_dvc->max_dvc_qng[sdev->id]);
                }
        } else {
@@ -7714,7 +7714,6 @@ advansys_narrow_slave_configure(struct scsi_device *sdev, ASC_DVC_VAR *asc_dvc)
                        asc_dvc->cfg->can_tagged_qng &= ~tid_bit;
                        asc_dvc->use_tagged_qng &= ~tid_bit;
                }
-               scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
        }
 
        if ((sdev->lun == 0) &&
@@ -7848,12 +7847,8 @@ advansys_wide_slave_configure(struct scsi_device *sdev, ADV_DVC_VAR *adv_dvc)
                }
        }
 
-       if ((adv_dvc->tagqng_able & tidmask) && sdev->tagged_supported) {
-               scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG,
-                                       adv_dvc->max_dvc_qng);
-       } else {
-               scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
-       }
+       if ((adv_dvc->tagqng_able & tidmask) && sdev->tagged_supported)
+               scsi_change_queue_depth(sdev, adv_dvc->max_dvc_qng);
 }
 
 /*