Merge branches 'pm-opp', 'pm-cpufreq' and 'pm-tools'

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

diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 1580205..c68a66e 100644 (file)
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -1224,10 +1224,9 @@ qla1280_slave_configure(struct scsi_device *device)
 
        if (device->tagged_supported &&
            (ha->bus_settings[bus].qtag_enables & (BIT_0 << target))) {
-               scsi_adjust_queue_depth(device, MSG_ORDERED_TAG,
-                                       ha->bus_settings[bus].hiwat);
+               scsi_change_queue_depth(device, ha->bus_settings[bus].hiwat);
        } else {
-               scsi_adjust_queue_depth(device, 0, default_depth);
+               scsi_change_queue_depth(device, default_depth);
        }
 
        nv->bus[bus].target[target].parameter.enable_sync = device->sdtr;