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

Commit 392e1d98 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: new quirk flag to avoid Set-Interface 



This patch (as1057) fixes a problem with the X-Rite/Gretag-Macbeth
Eye-One Pro display colorimeter; the device crashes when it receives a
Set-Interface request.  A new quirk (USB_QUIRK_NO_SET_INTF) is
introduced and a quirks entry is created for this device.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 12cd5b98

drivers/usb/core/message.c

+4 −1
Original line number Diff line number Diff line
@@ -1206,6 +1206,9 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate) 
		return -EINVAL;

	}



	if (dev->quirks & USB_QUIRK_NO_SET_INTF)

		ret = -EPIPE;

	else

		ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),

				   USB_REQ_SET_INTERFACE, USB_RECIP_INTERFACE,

				   alternate, interface, NULL, 0, 5000);

drivers/usb/core/quirks.c

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* M-Systems Flash Disk Pioneers */

	{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },



	/* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */

	{ USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF },



	/* Action Semiconductor flash disk */

	{ USB_DEVICE(0x10d6, 0x2200), .driver_info =

			USB_QUIRK_STRING_FETCH_255 },

include/linux/usb/quirks.h

+3 −0
Original line number Diff line number Diff line
@@ -9,3 +9,6 @@ 


/* device can't resume correctly so reset it instead */

#define USB_QUIRK_RESET_RESUME		0x00000002



/* device can't handle Set-Interface requests */

#define USB_QUIRK_NO_SET_INTF		0x00000004