Merge branch 'fixes' into misc

3 files changed, 30 insertions, 3 deletions

diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 13e4cc31bc79..16bc679dc2fc 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -2,7 +2,7 @@
  * USB Attached SCSI
  * Note that this is not the same as the USB Mass Storage driver
  *
- * Copyright Hans de Goede <hdegoede@redhat.com> for Red Hat, Inc. 2013 - 2014
+ * Copyright Hans de Goede <hdegoede@redhat.com> for Red Hat, Inc. 2013 - 2016
  * Copyright Matthew Wilcox for Intel Corp, 2010
  * Copyright Sarah Sharp for Intel Corp, 2010
  *
@@ -781,6 +781,17 @@ static int uas_eh_bus_reset_handler(struct scsi_cmnd *cmnd)
         return SUCCESS;
 }
 
+static int uas_target_alloc(struct scsi_target *starget)
+{
+        struct uas_dev_info *devinfo = (struct uas_dev_info *)
+                        dev_to_shost(starget->dev.parent)->hostdata;
+
+        if (devinfo->flags & US_FL_NO_REPORT_LUNS)
+                starget->no_report_luns = 1;
+
+        return 0;
+}
+
 static int uas_slave_alloc(struct scsi_device *sdev)
 {
         struct uas_dev_info *devinfo =
@@ -824,7 +835,6 @@ static int uas_slave_configure(struct scsi_device *sdev)
         if (devinfo->flags & US_FL_BROKEN_FUA)
                 sdev->broken_fua = 1;
 
-        scsi_change_queue_depth(sdev, devinfo->qdepth - 2);
         return 0;
 }
 
@@ -832,6 +842,7 @@ static struct scsi_host_template uas_host_template = {
         .module = THIS_MODULE,
         .name = "uas",
         .queuecommand = uas_queuecommand,
+        .target_alloc = uas_target_alloc,
         .slave_alloc = uas_slave_alloc,
         .slave_configure = uas_slave_configure,
         .eh_abort_handler = uas_eh_abort_handler,
@@ -956,6 +967,12 @@ static int uas_probe(struct usb_interface *intf, const struct usb_device_id *id)
         if (result)
                 goto set_alt0;
 
+        /*
+         * 1 tag is reserved for untagged commands +
+         * 1 tag to avoid off by one errors in some bridge firmwares
+         */
+        shost->can_queue = devinfo->qdepth - 2;
+
         usb_set_intfdata(intf, shost);
         result = scsi_add_host(shost, &intf->dev);
         if (result)
diff --git a/drivers/usb/storage/unusual_uas.h b/drivers/usb/storage/unusual_uas.h
index ccc113e83d88..53341a77d89f 100644
--- a/drivers/usb/storage/unusual_uas.h
+++ b/drivers/usb/storage/unusual_uas.h
@@ -64,6 +64,13 @@ UNUSUAL_DEV(0x0bc2, 0x3312, 0x0000, 0x9999,
                 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
                 US_FL_NO_ATA_1X),
 
+/* Reported-by: David Webb <djw@noc.ac.uk> */
+UNUSUAL_DEV(0x0bc2, 0x331a, 0x0000, 0x9999,
+                "Seagate",
+                "Expansion Desk",
+                USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+                US_FL_NO_REPORT_LUNS),
+
 /* Reported-by: Hans de Goede <hdegoede@redhat.com> */
 UNUSUAL_DEV(0x0bc2, 0x3320, 0x0000, 0x9999,
                 "Seagate",
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 43576ed31ccd..9de988a0f856 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -482,7 +482,7 @@ void usb_stor_adjust_quirks(struct usb_device *udev, unsigned long *fflags)
                         US_FL_NO_READ_DISC_INFO | US_FL_NO_READ_CAPACITY_16 |
                         US_FL_INITIAL_READ10 | US_FL_WRITE_CACHE |
                         US_FL_NO_ATA_1X | US_FL_NO_REPORT_OPCODES |
-                        US_FL_MAX_SECTORS_240);
+                        US_FL_MAX_SECTORS_240 | US_FL_NO_REPORT_LUNS);
 
         p = quirks;
         while (*p) {
@@ -532,6 +532,9 @@ void usb_stor_adjust_quirks(struct usb_device *udev, unsigned long *fflags)
                 case 'i':
                         f |= US_FL_IGNORE_DEVICE;
                         break;
+                case 'j':
+                        f |= US_FL_NO_REPORT_LUNS;
+                        break;
                 case 'l':
                         f |= US_FL_NOT_LOCKABLE;
                         break;