Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5e3b314 authored by Hans de Goede's avatar Hans de Goede Committed by Sasha Levin
Browse files

uas: Allow uas_use_uas_driver to return usb-storage flags 



[ Upstream commit a5011d44f0e1117a6db14b19b57c51f8be5673a0 ]

uas_use_uas_driver may set some US_FL_foo flags during detection, currently
these are stored in a local variable and then throw away, but these may be
of interest to the caller, so add an extra parameter to (optionally) return
the detected flags, and use this in the uas driver.

Cc: stable@vger.kernel.org # 3.16
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 1a5be433

drivers/usb/storage/uas-detect.h

+5 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ static int uas_find_endpoints(struct usb_host_interface *alt, 
}



static int uas_use_uas_driver(struct usb_interface *intf,

			      const struct usb_device_id *id)

			      const struct usb_device_id *id,

			      unsigned long *flags_ret)

{

	struct usb_host_endpoint *eps[4] = { };

	struct usb_device *udev = interface_to_usbdev(intf);
@@ -109,5 +110,8 @@ static int uas_use_uas_driver(struct usb_interface *intf, 
		return 0;

	}



	if (flags_ret)

		*flags_ret = flags;



	return 1;

}

drivers/usb/storage/uas.c

+3 −3
Original line number Diff line number Diff line
@@ -906,8 +906,9 @@ static int uas_probe(struct usb_interface *intf, const struct usb_device_id *id) 
	struct Scsi_Host *shost = NULL;

	struct uas_dev_info *devinfo;

	struct usb_device *udev = interface_to_usbdev(intf);

	unsigned long dev_flags;



	if (!uas_use_uas_driver(intf, id))

	if (!uas_use_uas_driver(intf, id, &dev_flags))

		return -ENODEV;



	if (uas_switch_interface(udev, intf))
@@ -929,8 +930,7 @@ static int uas_probe(struct usb_interface *intf, const struct usb_device_id *id) 
	devinfo->udev = udev;

	devinfo->resetting = 0;

	devinfo->shutdown = 0;

	devinfo->flags = id->driver_info;

	usb_stor_adjust_quirks(udev, &devinfo->flags);

	devinfo->flags = dev_flags;

	init_usb_anchor(&devinfo->cmd_urbs);

	init_usb_anchor(&devinfo->sense_urbs);

	init_usb_anchor(&devinfo->data_urbs);

drivers/usb/storage/usb.c

+1 −1
Original line number Diff line number Diff line
@@ -1062,7 +1062,7 @@ static int storage_probe(struct usb_interface *intf, 


	/* If uas is enabled and this device can do uas then ignore it. */

#if IS_ENABLED(CONFIG_USB_UAS)

	if (uas_use_uas_driver(intf, id))

	if (uas_use_uas_driver(intf, id, NULL))

		return -ENXIO;

#endif