1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index bcb64eb1387f..2233ed6b89e3 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -321,16 +321,10 @@ static int pmcraid_change_queue_type(struct scsi_device *scsi_dev, int tag)
         struct pmcraid_resource_entry *res;
 
         res = (struct pmcraid_resource_entry *)scsi_dev->hostdata;
-
-        if ((res) && scsi_dev->tagged_supported &&
-            (RES_IS_GSCSI(res->cfg_entry) || RES_IS_VSET(res->cfg_entry))) {
-                scsi_set_tag_type(scsi_dev, tag);
-
-                if (tag)
-                        scsi_activate_tcq(scsi_dev, scsi_dev->queue_depth);
-                else
-                        scsi_deactivate_tcq(scsi_dev, scsi_dev->queue_depth);
-        } else
+        if (res && scsi_dev->tagged_supported &&
+            (RES_IS_GSCSI(res->cfg_entry) || RES_IS_VSET(res->cfg_entry)))
+                tag = scsi_change_queue_type(scsi_dev, tag);
+        else
                 tag = 0;
 
         return tag;