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

Commit c474009c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-4.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB driver fixes from Greg KH:
 "Here are a number of small USB fixes for 4.4-rc5.  All of them have
  been in linux-next.  The majority are gadget and phy issues, with a
  few new quirks and device ids added as well"

* tag 'usb-4.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (32 commits)
  USB: add quirk for devices with broken LPM
  xhci: fix usb2 resume timing and races.
  usb: musb: fail with error when no DMA controller set
  usb: gadget: uvc: fix permissions of configfs attributes
  usb: musb: core: Fix pm runtime for deferred probe
  usb: phy: msm: fix a possible NULL dereference
  USB: host: ohci-at91: fix a crash in ohci_hcd_at91_overcurrent_irq
  usb: Quiet down false peer failure messages
  usb: xhci: fix config fail of FS hub behind a HS hub with MTT
  xhci: Fix memory leak in xhci_pme_acpi_rtd3_enable()
  usb: Use the USB_SS_MULT() macro to decode burst multiplier for log message
  USB: whci-hcd: add check for dma mapping error
  usb: core : hub: Fix BOS 'NULL pointer' kernel panic
  USB: quirks: Apply ALWAYS_POLL to all ELAN devices
  usb-storage: Fix scsi-sd failure "Invalid field in cdb" for USB adapter JMicron
  USB: quirks: Fix another ELAN touchscreen
  usb: dwc3: gadget: don't prestart interrupt endpoints
  USB: serial: Another Infineon flash loader USB ID
  USB: cdc_acm: Ignore Infineon Flash Loader utility
  USB: cp210x: Remove CP2110 ID from compatibility list
  ...
parents 097b285d ad87e032

drivers/hid/hid-ids.h

+0 −5
Original line number Diff line number Diff line
@@ -316,11 +316,6 @@ 
#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001	0xa001



#define USB_VENDOR_ID_ELAN		0x04f3

#define USB_DEVICE_ID_ELAN_TOUCHSCREEN	0x0089

#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B	0x009b

#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_0103	0x0103

#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_010c	0x010c

#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F	0x016f



#define USB_VENDOR_ID_ELECOM		0x056e

#define USB_DEVICE_ID_ELECOM_BM084	0x0061

drivers/hid/usbhid/hid-quirks.c

+3 −6
Original line number Diff line number Diff line
@@ -72,11 +72,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT },

	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_0103, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_010c, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_ELAN, HID_ANY_ID, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },
@@ -340,7 +336,8 @@ static const struct hid_blacklist *usbhid_exists_squirk(const u16 idVendor, 


	for (; hid_blacklist[n].idVendor; n++)

		if (hid_blacklist[n].idVendor == idVendor &&

				hid_blacklist[n].idProduct == idProduct)

			(hid_blacklist[n].idProduct == (__u16) HID_ANY_ID ||

				hid_blacklist[n].idProduct == idProduct))

			bl_entry = &hid_blacklist[n];



	if (bl_entry != NULL)

drivers/usb/class/cdc-acm.c

+5 −0
Original line number Diff line number Diff line
@@ -1838,6 +1838,11 @@ static const struct usb_device_id acm_ids[] = { 
	},

#endif



	/* Exclude Infineon Flash Loader utility */

	{ USB_DEVICE(0x058b, 0x0041),

	.driver_info = IGNORE_DEVICE,

	},



	/* control interfaces without any protocol set */

	{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,

		USB_CDC_PROTO_NONE) },

drivers/usb/core/config.c

+2 −1
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno, 
		   USB_SS_MULT(desc->bmAttributes) > 3) {

		dev_warn(ddev, "Isoc endpoint has Mult of %d in "

				"config %d interface %d altsetting %d ep %d: "

				"setting to 3\n", desc->bmAttributes + 1,

				"setting to 3\n",

				USB_SS_MULT(desc->bmAttributes),

				cfgno, inum, asnum, ep->desc.bEndpointAddress);

		ep->ss_ep_comp.bmAttributes = 2;

	}

drivers/usb/core/hub.c

+14 −8
Original line number Diff line number Diff line
@@ -124,6 +124,10 @@ struct usb_hub *usb_hub_to_struct_hub(struct usb_device *hdev) 


int usb_device_supports_lpm(struct usb_device *udev)

{

	/* Some devices have trouble with LPM */

	if (udev->quirks & USB_QUIRK_NO_LPM)

		return 0;



	/* USB 2.1 (and greater) devices indicate LPM support through

	 * their USB 2.0 Extended Capabilities BOS descriptor.

	 */
@@ -4512,6 +4516,8 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, 
		goto fail;

	}



	usb_detect_quirks(udev);



	if (udev->wusb == 0 && le16_to_cpu(udev->descriptor.bcdUSB) >= 0x0201) {

		retval = usb_get_bos_descriptor(udev);

		if (!retval) {
@@ -4710,7 +4716,6 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, 
		if (status < 0)

			goto loop;



		usb_detect_quirks(udev);

		if (udev->quirks & USB_QUIRK_DELAY_INIT)

			msleep(1000);
@@ -5326,9 +5331,6 @@ static int usb_reset_and_verify_device(struct usb_device *udev) 
	if (udev->usb2_hw_lpm_enabled == 1)

		usb_set_usb2_hardware_lpm(udev, 0);



	bos = udev->bos;

	udev->bos = NULL;



	/* Disable LPM and LTM while we reset the device and reinstall the alt

	 * settings.  Device-initiated LPM settings, and system exit latency

	 * settings are cleared when the device is reset, so we have to set
@@ -5337,15 +5339,18 @@ static int usb_reset_and_verify_device(struct usb_device *udev) 
	ret = usb_unlocked_disable_lpm(udev);

	if (ret) {

		dev_err(&udev->dev, "%s Failed to disable LPM\n.", __func__);

		goto re_enumerate;

		goto re_enumerate_no_bos;

	}

	ret = usb_disable_ltm(udev);

	if (ret) {

		dev_err(&udev->dev, "%s Failed to disable LTM\n.",

				__func__);

		goto re_enumerate;

		goto re_enumerate_no_bos;

	}



	bos = udev->bos;

	udev->bos = NULL;



	for (i = 0; i < SET_CONFIG_TRIES; ++i) {



		/* ep0 maxpacket size may change; let the HCD know about it.
@@ -5442,10 +5447,11 @@ static int usb_reset_and_verify_device(struct usb_device *udev) 
	return 0;



re_enumerate:

	/* LPM state doesn't matter when we're about to destroy the device. */

	hub_port_logical_disconnect(parent_hub, port1);

	usb_release_bos_descriptor(udev);

	udev->bos = bos;

re_enumerate_no_bos:

	/* LPM state doesn't matter when we're about to destroy the device. */

	hub_port_logical_disconnect(parent_hub, port1);

	return -ENODEV;

}