1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 7bcace2cdd53..fce4e47becc7 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -2700,11 +2700,8 @@ static int scsi_debug_slave_configure(struct scsi_device *sdp)
         devip = devInfoReg(sdp);
         if (NULL == devip)
                 return 1;       /* no resources, will be marked offline */
-        sdp->hostdata = devip;
         sdp->tagged_supported = 1;
-        if (sdp->host->cmd_per_lun)
-                scsi_adjust_queue_depth(sdp, DEF_TAGGED_QUEUING,
-                                        DEF_CMD_PER_LUN);
+        sdp->hostdata = devip;
         blk_queue_max_segment_size(sdp->request_queue, -1U);
         if (scsi_debug_no_uld)
                 sdp->no_uld_attach = 1;
@@ -4494,7 +4491,7 @@ sdebug_change_qdepth(struct scsi_device *sdev, int qdepth, int reason)
                 /* allow to exceed max host queued_arr elements for testing */
                 if (qdepth > SCSI_DEBUG_CANQUEUE + 10)
                         qdepth = SCSI_DEBUG_CANQUEUE + 10;
-                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth);
+                scsi_adjust_queue_depth(sdev, qdepth);
         } else if (reason == SCSI_QDEPTH_QFULL)
                 scsi_track_queue_full(sdev, qdepth);
         else