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

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

diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index 943ad3a..227dd2c 100644 (file)
--- a/drivers/scsi/eata.c
+++ b/drivers/scsi/eata.c
@@ -946,20 +946,18 @@ static int eata2x_slave_configure(struct scsi_device *dev)
 
        if (TLDEV(dev->type) && dev->tagged_supported) {
                if (tag_mode == TAG_SIMPLE) {
-                       scsi_adjust_queue_depth(dev, MSG_SIMPLE_TAG, tqd);
                        tag_suffix = ", simple tags";
                } else if (tag_mode == TAG_ORDERED) {
-                       scsi_adjust_queue_depth(dev, MSG_ORDERED_TAG, tqd);
                        tag_suffix = ", ordered tags";
                } else {
-                       scsi_adjust_queue_depth(dev, 0, tqd);
                        tag_suffix = ", no tags";
                }
+               scsi_change_queue_depth(dev, tqd);
        } else if (TLDEV(dev->type) && linked_comm) {
-               scsi_adjust_queue_depth(dev, 0, tqd);
+               scsi_change_queue_depth(dev, tqd);
                tag_suffix = ", untagged";
        } else {
-               scsi_adjust_queue_depth(dev, 0, utqd);
+               scsi_change_queue_depth(dev, utqd);
                tag_suffix = "";
        }