3.16-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Hans de Goede <[email protected]>

commit 43508be512661c905d0320ee73e0b65ef36d2459 upstream.

So that an user who wants to use uas can see why he is not getting uas.

Also move the check down so that we don't warn if there are other reasons
why uas cannot work.

Signed-off-by: Hans de Goede <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/usb/storage/uas-detect.h |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

--- a/drivers/usb/storage/uas-detect.h
+++ b/drivers/usb/storage/uas-detect.h
@@ -64,9 +64,6 @@ static int uas_use_uas_driver(struct usb
        if (flags & US_FL_IGNORE_UAS)
                return 0;
 
-       if (udev->speed >= USB_SPEED_SUPER && !hcd->can_do_streams)
-               return 0;
-
        alt = uas_find_uas_alt_setting(intf);
        if (alt < 0)
                return 0;
@@ -84,5 +81,14 @@ static int uas_use_uas_driver(struct usb
                return 0;
        }
 
+       if (udev->speed >= USB_SPEED_SUPER && !hcd->can_do_streams) {
+               dev_warn(&udev->dev,
+                       "USB controller %s does not support streams, which are 
required by the UAS driver.\n",
+                       hcd_to_bus(hcd)->bus_name);
+               dev_warn(&udev->dev,
+                       "Please try an other USB controller if you wish to use 
UAS.\n");
+               return 0;
+       }
+
        return 1;
 }


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to