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

Commit 8ee7a330 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are some fixes for 3.15-rc8 that resolve a number of tiny USB
  issues that have been reported, and there are some new device ids as
  well.

  All have been tested in linux-next"

* tag 'usb-3.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  xhci: delete endpoints from bandwidth list before freeing whole device
  usb: pci-quirks: Prevent Sony VAIO t-series from switching usb ports
  USB: cdc-wdm: properly include types.h
  usb: cdc-wdm: export cdc-wdm uapi header
  USB: serial: option: add support for Novatel E371 PCIe card
  USB: ftdi_sio: add NovaTech OrionLXm product ID
  USB: io_ti: fix firmware download on big-endian machines (part 2)
  USB: Avoid runtime suspend loops for HCDs that can't handle suspend/resume
parents da579dd6 5dc2808c

drivers/usb/core/driver.c

+6 −3
Original line number Diff line number Diff line
@@ -1822,10 +1822,13 @@ int usb_runtime_suspend(struct device *dev) 
	if (status == -EAGAIN || status == -EBUSY)

		usb_mark_last_busy(udev);



	/* The PM core reacts badly unless the return code is 0,

	 * -EAGAIN, or -EBUSY, so always return -EBUSY on an error.

	/*

	 * The PM core reacts badly unless the return code is 0,

	 * -EAGAIN, or -EBUSY, so always return -EBUSY on an error

	 * (except for root hubs, because they don't suspend through

	 * an upstream port like other USB devices).

	 */

	if (status != 0)

	if (status != 0 && udev->parent)

		return -EBUSY;

	return status;

}

drivers/usb/core/hub.c

+13 −2
Original line number Diff line number Diff line
@@ -1691,8 +1691,19 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) 
	 */

	pm_runtime_set_autosuspend_delay(&hdev->dev, 0);



	/* Hubs have proper suspend/resume support. */

	/*

	 * Hubs have proper suspend/resume support, except for root hubs

	 * where the controller driver doesn't have bus_suspend and

	 * bus_resume methods.

	 */

	if (hdev->parent) {		/* normal device */

		usb_enable_autosuspend(hdev);

	} else {			/* root hub */

		const struct hc_driver *drv = bus_to_hcd(hdev->bus)->driver;



		if (drv->bus_suspend && drv->bus_resume)

			usb_enable_autosuspend(hdev);

	}



	if (hdev->level == MAX_TOPO_LEVEL) {

		dev_err(&intf->dev,

drivers/usb/host/pci-quirks.c

+7 −0
Original line number Diff line number Diff line
@@ -847,6 +847,13 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) 
	bool		ehci_found = false;

	struct pci_dev	*companion = NULL;



	/* Sony VAIO t-series with subsystem device ID 90a8 is not capable of

	 * switching ports from EHCI to xHCI

	 */

	if (xhci_pdev->subsystem_vendor == PCI_VENDOR_ID_SONY &&

	    xhci_pdev->subsystem_device == 0x90a8)

		return;



	/* make sure an intel EHCI controller exists */

	for_each_pci_dev(companion) {

		if (companion->class == PCI_CLASS_SERIAL_USB_EHCI &&

drivers/usb/host/xhci-mem.c

+10 −10
Original line number Diff line number Diff line
@@ -1822,6 +1822,16 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci) 
		kfree(cur_cd);

	}



	num_ports = HCS_MAX_PORTS(xhci->hcs_params1);

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

		struct xhci_interval_bw_table *bwt = &xhci->rh_bw[i].bw_table;

		for (j = 0; j < XHCI_MAX_INTERVAL; j++) {

			struct list_head *ep = &bwt->interval_bw[j].endpoints;

			while (!list_empty(ep))

				list_del_init(ep->next);

		}

	}



	for (i = 1; i < MAX_HC_SLOTS; ++i)

		xhci_free_virt_device(xhci, i);
@@ -1857,16 +1867,6 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci) 
	if (!xhci->rh_bw)

		goto no_bw;



	num_ports = HCS_MAX_PORTS(xhci->hcs_params1);

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

		struct xhci_interval_bw_table *bwt = &xhci->rh_bw[i].bw_table;

		for (j = 0; j < XHCI_MAX_INTERVAL; j++) {

			struct list_head *ep = &bwt->interval_bw[j].endpoints;

			while (!list_empty(ep))

				list_del_init(ep->next);

		}

	}



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

		struct xhci_tt_bw_info *tt, *n;

		list_for_each_entry_safe(tt, n, &xhci->rh_bw[i].tts, tt_list) {

drivers/usb/serial/ftdi_sio.c

+2 −0
Original line number Diff line number Diff line
@@ -580,6 +580,8 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(FTDI_VID, FTDI_TAVIR_STK500_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_TIAO_UMPA_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLXM_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	/*

	 * ELV devices:

	 */