1 files changed, 12 insertions, 7 deletions

diff --git a/drivers/usb/storage/uas-detect.h b/drivers/usb/storage/uas-detect.h
index f58caa9e6a27..ecc83c405a8b 100644
--- a/drivers/usb/storage/uas-detect.h
+++ b/drivers/usb/storage/uas-detect.h
@@ -9,7 +9,8 @@ static int uas_is_interface(struct usb_host_interface *intf)
                 intf->desc.bInterfaceProtocol == USB_PR_UAS);
 }
 
-static int uas_find_uas_alt_setting(struct usb_interface *intf)
+static struct usb_host_interface *uas_find_uas_alt_setting(
+                struct usb_interface *intf)
 {
         int i;
 
@@ -17,10 +18,10 @@ static int uas_find_uas_alt_setting(struct usb_interface *intf)
                 struct usb_host_interface *alt = &intf->altsetting[i];
 
                 if (uas_is_interface(alt))
-                        return alt->desc.bAlternateSetting;
+                        return alt;
         }
 
-        return -ENODEV;
+        return NULL;
 }
 
 static int uas_find_endpoints(struct usb_host_interface *alt,
@@ -58,14 +59,14 @@ static int uas_use_uas_driver(struct usb_interface *intf,
         struct usb_device *udev = interface_to_usbdev(intf);
         struct usb_hcd *hcd = bus_to_hcd(udev->bus);
         unsigned long flags = id->driver_info;
-        int r, alt;
-
+        struct usb_host_interface *alt;
+        int r;
 
         alt = uas_find_uas_alt_setting(intf);
-        if (alt < 0)
+        if (!alt)
                 return 0;
 
-        r = uas_find_endpoints(&intf->altsetting[alt], eps);
+        r = uas_find_endpoints(alt, eps);
         if (r < 0)
                 return 0;
 
@@ -110,6 +111,10 @@ static int uas_use_uas_driver(struct usb_interface *intf,
                 }
         }
 
+        /* All Seagate disk enclosures have broken ATA pass-through support */
+        if (le16_to_cpu(udev->descriptor.idVendor) == 0x0bc2)
+                flags |= US_FL_NO_ATA_1X;
+
         usb_stor_adjust_quirks(udev, &flags);
 
         if (flags & US_FL_IGNORE_UAS) {