evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

uas: Add a uas_find_uas_alt_setting helper function

Browse source 
This is a preparation patch for teaching usb-storage to not bind to
uas devices.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
This commit is contained in:
Hans de Goede 2013-10-21 08:00:58 +01:00 • committed by Sarah Sharp
parent d3f7c1560a
commit e1be067b68
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/usb/storage/uas.c
View file

@ -892,10 +892,10 @@ static int uas_isnt_supported(struct usb_device *udev)
return -ENODEV; return -ENODEV;
} }
static int uas_switch_interface(struct usb_device *udev, static int uas_find_uas_alt_setting(struct usb_interface *intf)
struct usb_interface *intf)
{ {
int i; int i;
struct usb_device *udev = interface_to_usbdev(intf);
int sg_supported = udev->bus->sg_tablesize != 0; int sg_supported = udev->bus->sg_tablesize != 0;
for (i = 0; i < intf->num_altsetting; i++) { for (i = 0; i < intf->num_altsetting; i++) {
@ -904,15 +904,26 @@ static int uas_switch_interface(struct usb_device *udev,
if (uas_is_interface(alt)) { if (uas_is_interface(alt)) {
if (!sg_supported) if (!sg_supported)
return uas_isnt_supported(udev); return uas_isnt_supported(udev);
return usb_set_interface(udev, return alt->desc.bAlternateSetting;
alt->desc.bInterfaceNumber,
alt->desc.bAlternateSetting);
} }
} }
return -ENODEV; return -ENODEV;
} }
static int uas_switch_interface(struct usb_device *udev,
struct usb_interface *intf)
{
int alt;
alt = uas_find_uas_alt_setting(intf);
if (alt < 0)
return alt;
return usb_set_interface(udev,
intf->altsetting[0].desc.bInterfaceNumber, alt);
}
static void uas_configure_endpoints(struct uas_dev_info *devinfo) static void uas_configure_endpoints(struct uas_dev_info *devinfo)
{ {
struct usb_host_endpoint *eps[4] = { }; struct usb_host_endpoint *eps[4] = { };