diff options
author | Hans de Goede <hdegoede@redhat.com> | 2013-11-16 06:19:36 -0500 |
---|---|---|
committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2014-03-04 18:38:17 -0500 |
commit | 97172a660cfc744996112eb625a77282a4b627b7 (patch) | |
tree | 30b6c58fc9ff51d15829680fb335c72ab66cf521 /drivers/usb/storage/uas-detect.h | |
parent | d24d481b7d369b08cce734bf80be374eed5a6e58 (diff) |
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.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/storage/uas-detect.h b/drivers/usb/storage/uas-detect.h index 02bf5ec957f5..082bde1fa74d 100644 --- a/drivers/usb/storage/uas-detect.h +++ b/drivers/usb/storage/uas-detect.h | |||
@@ -1,5 +1,6 @@ | |||
1 | #include <linux/usb.h> | 1 | #include <linux/usb.h> |
2 | #include <linux/usb/hcd.h> | 2 | #include <linux/usb/hcd.h> |
3 | #include "usb.h" | ||
3 | 4 | ||
4 | static int uas_is_interface(struct usb_host_interface *intf) | 5 | static int uas_is_interface(struct usb_host_interface *intf) |
5 | { | 6 | { |
@@ -42,8 +43,11 @@ static int uas_find_uas_alt_setting(struct usb_interface *intf) | |||
42 | static int uas_use_uas_driver(struct usb_interface *intf, | 43 | static int uas_use_uas_driver(struct usb_interface *intf, |
43 | const struct usb_device_id *id) | 44 | const struct usb_device_id *id) |
44 | { | 45 | { |
46 | struct usb_device *udev = interface_to_usbdev(intf); | ||
45 | unsigned long flags = id->driver_info; | 47 | unsigned long flags = id->driver_info; |
46 | 48 | ||
49 | usb_stor_adjust_quirks(udev, &flags); | ||
50 | |||
47 | if (flags & US_FL_IGNORE_UAS) | 51 | if (flags & US_FL_IGNORE_UAS) |
48 | return 0; | 52 | return 0; |
49 | 53 | ||