aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2014-11-03 08:49:39 -0500
committerChristoph Hellwig <hch@lst.de>2014-11-12 05:19:42 -0500
commit8f88dc41927f6a9bbb03d5d0496d04ba3775dc8d (patch)
tree1124d33e4bb7bba585d4cb416554805005bfd1cb /drivers/message
parent5066863337afdb0ad7323f424f7959d9f9f066da (diff)
mptfusion: don't change queue type in ->change_queue_depth
This function shouldn't change the queue type, just the depth. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Mike Christie <michaelc@cs.wisc.edu> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Reviewed-by: Hannes Reinecke <hare@suse.de>
Diffstat (limited to 'drivers/message')
-rw-r--r--drivers/message/fusion/mptscsih.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 00bd13dc3dc4..c0d84a09db9a 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -2322,7 +2322,6 @@ mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
2322 VirtTarget *vtarget; 2322 VirtTarget *vtarget;
2323 struct scsi_target *starget; 2323 struct scsi_target *starget;
2324 int max_depth; 2324 int max_depth;
2325 int tagged;
2326 MPT_ADAPTER *ioc = hd->ioc; 2325 MPT_ADAPTER *ioc = hd->ioc;
2327 2326
2328 starget = scsi_target(sdev); 2327 starget = scsi_target(sdev);
@@ -2347,12 +2346,8 @@ mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
2347 2346
2348 if (qdepth > max_depth) 2347 if (qdepth > max_depth)
2349 qdepth = max_depth; 2348 qdepth = max_depth;
2350 if (qdepth == 1)
2351 tagged = 0;
2352 else
2353 tagged = MSG_SIMPLE_TAG;
2354 2349
2355 scsi_adjust_queue_depth(sdev, tagged, qdepth); 2350 scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth);
2356 return sdev->queue_depth; 2351 return sdev->queue_depth;
2357} 2352}
2358 2353