Commit 97172a66 authored by Hans de Goede's avatar Hans de Goede Committed by Sarah Sharp

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: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
parent d24d481b
...@@ -204,7 +204,7 @@ config USB_STORAGE_ENE_UB6250 ...@@ -204,7 +204,7 @@ config USB_STORAGE_ENE_UB6250
config USB_UAS config USB_UAS
tristate "USB Attached SCSI" tristate "USB Attached SCSI"
depends on SCSI && BROKEN depends on SCSI && USB_STORAGE && BROKEN
help help
The USB Attached SCSI protocol is supported by some USB The USB Attached SCSI protocol is supported by some USB
storage devices. It permits higher performance by supporting storage devices. It permits higher performance by supporting
......
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/usb/hcd.h> #include <linux/usb/hcd.h>
#include "usb.h"
static int uas_is_interface(struct usb_host_interface *intf) 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) ...@@ -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, static int uas_use_uas_driver(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
struct usb_device *udev = interface_to_usbdev(intf);
unsigned long flags = id->driver_info; unsigned long flags = id->driver_info;
usb_stor_adjust_quirks(udev, &flags);
if (flags & US_FL_IGNORE_UAS) if (flags & US_FL_IGNORE_UAS)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment