1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index f4cb7b3e9e23..1cb64a8e18c9 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -727,9 +727,7 @@ show_queue_type_field(struct device *dev, struct device_attribute *attr,
         struct scsi_device *sdev = to_scsi_device(dev);
         const char *name = "none";
 
-        if (sdev->ordered_tags)
-                name = "ordered";
-        else if (sdev->simple_tags)
+        if (sdev->simple_tags)
                 name = "simple";
 
         return snprintf(buf, 20, "%s\n", name);
@@ -747,9 +745,12 @@ store_queue_type_field(struct device *dev, struct device_attribute *attr,
         if (!sdev->tagged_supported || !sht->change_queue_type)
                 return -EINVAL;
 
-        if (strncmp(buf, "ordered", 7) == 0)
-                tag_type = MSG_ORDERED_TAG;
-        else if (strncmp(buf, "simple", 6) == 0)
+        /*
+         * We're never issueing order tags these days, but allow the value
+         * for backwards compatibility.
+         */
+        if (strncmp(buf, "ordered", 7) == 0 ||
+            strncmp(buf, "simple", 6) == 0)
                 tag_type = MSG_SIMPLE_TAG;
         else if (strncmp(buf, "none", 4) != 0)
                 return -EINVAL;
@@ -876,11 +877,10 @@ sdev_store_queue_depth(struct device *dev, struct device_attribute *attr,
 
         depth = simple_strtoul(buf, NULL, 0);
 
-        if (depth < 1)
+        if (depth < 1 || depth > sht->can_queue)
                 return -EINVAL;
 
-        retval = sht->change_queue_depth(sdev, depth,
-                                         SCSI_QDEPTH_DEFAULT);
+        retval = sht->change_queue_depth(sdev, depth);
         if (retval < 0)
                 return retval;