aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage/uas-detect.h
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2013-11-16 12:19:36 +0100
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2014-03-04 15:38:17 -0800
commit97172a660cfc744996112eb625a77282a4b627b7 (patch)
tree30b6c58fc9ff51d15829680fb335c72ab66cf521 /drivers/usb/storage/uas-detect.h
parentd24d481b7d369b08cce734bf80be374eed5a6e58 (diff)
downloadlinux-97172a660cfc744996112eb625a77282a4b627b7.tar.gz
uas: Honor no-uas quirk set in usb-storage's quirks module parameter
Falling back from uas to usb-storage requires coordination between uas and usb-storage, so use usb-storage's quirks module parameter, rather then requiring the user to pass a param to 2 different modules. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Diffstat (limited to 'drivers/usb/storage/uas-detect.h')
-rw-r--r--drivers/usb/storage/uas-detect.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/storage/uas-detect.h b/drivers/usb/storage/uas-detect.h
index 02bf5ec957f513..082bde1fa74d64 100644
--- a/drivers/usb/storage/uas-detect.h
+++ b/drivers/usb/storage/uas-detect.h
@@ -1,5 +1,6 @@
#include <linux/usb.h>
#include <linux/usb/hcd.h>
+#include "usb.h"
static int uas_is_interface(struct usb_host_interface *intf)
{
@@ -42,8 +43,11 @@ static int uas_find_uas_alt_setting(struct usb_interface *intf)
static int uas_use_uas_driver(struct usb_interface *intf,
const struct usb_device_id *id)
{
+ struct usb_device *udev = interface_to_usbdev(intf);
unsigned long flags = id->driver_info;
+ usb_stor_adjust_quirks(udev, &flags);
+
if (flags & US_FL_IGNORE_UAS)
return 0;