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

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

Pull USB fixes from Greg Kroah-Hartman:
 "Here are a number of USB bugfixes and new device ids for the 3.10-rc5
  tree.

  Nothing major here, a number of new device ids (and movement from the
  option to the zte_ev driver of a number of ids that we had previously
  gotten wrong, some xhci bugfixes, some usb-serial driver fixes that
  were recently found, some host controller fixes / reverts, and a
  variety of smaller other things"

* tag 'usb-3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (29 commits)
  USB: option,zte_ev: move most ZTE CDMA devices to zte_ev
  USB: option: blacklist network interface on Huawei E1820
  USB: whiteheat: fix broken port configuration
  USB: serial: fix TIOCMIWAIT return value
  USB: mos7720: fix hardware flow control
  USB: keyspan: remove unused endpoint-array access
  USB: keyspan: fix bogus array index
  USB: zte_ev: fix broken open
  USB: serial: Add Option GTM681W to qcserial device table.
  USB: Serial: cypress_M8: Enable FRWD Dongle hidcom device
  USB: EHCI: fix regression related to qh_refresh()
  usbfs: Increase arbitrary limit for USB 3 isopkt length
  USB: zte_ev: fix control-message timeouts
  USB: mos7720: fix message timeouts
  USB: iuu_phoenix: fix bulk-message timeout
  USB: ark3116: fix control-message timeout
  USB: mos7840: fix DMA to stack
  USB: mos7720: fix DMA to stack
  USB: visor: fix initialisation of Treo/Kyocera devices
  USB: serial: fix Treo/Kyocera interrrupt-in urb context
  ...
parents c51aa6db 73228a05

drivers/usb/core/devio.c

+7 −3
Original line number Diff line number Diff line
@@ -1287,9 +1287,13 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb, 
			goto error;

		}

		for (totlen = u = 0; u < uurb->number_of_packets; u++) {

			/* arbitrary limit,

			 * sufficient for USB 2.0 high-bandwidth iso */

			if (isopkt[u].length > 8192) {

			/*

			 * arbitrary limit need for USB 3.0

			 * bMaxBurst (0~15 allowed, 1~16 packets)

			 * bmAttributes (bit 1:0, mult 0~2, 1~3 packets)

			 * sizemax: 1024 * 16 * 3 = 49152

			 */

			if (isopkt[u].length > 49152) {

				ret = -EINVAL;

				goto error;

			}

drivers/usb/dwc3/dwc3-exynos.c

+1 −1
Original line number Diff line number Diff line
@@ -164,9 +164,9 @@ static int dwc3_exynos_remove(struct platform_device *pdev) 
{

	struct dwc3_exynos	*exynos = platform_get_drvdata(pdev);



	device_for_each_child(&pdev->dev, NULL, dwc3_exynos_remove_child);

	platform_device_unregister(exynos->usb2_phy);

	platform_device_unregister(exynos->usb3_phy);

	device_for_each_child(&pdev->dev, NULL, dwc3_exynos_remove_child);



	clk_disable_unprepare(exynos->clk);

drivers/usb/dwc3/dwc3-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -196,9 +196,9 @@ static void dwc3_pci_remove(struct pci_dev *pci) 
{

	struct dwc3_pci	*glue = pci_get_drvdata(pci);



	platform_device_unregister(glue->dwc3);

	platform_device_unregister(glue->usb2_phy);

	platform_device_unregister(glue->usb3_phy);

	platform_device_unregister(glue->dwc3);

	pci_set_drvdata(pci, NULL);

	pci_disable_device(pci);

}

drivers/usb/dwc3/gadget.c

+12 −4
Original line number Diff line number Diff line
@@ -1706,11 +1706,19 @@ static void dwc3_gadget_free_endpoints(struct dwc3 *dwc) 
		dep = dwc->eps[epnum];

		if (!dep)

			continue;



		/*

		 * Physical endpoints 0 and 1 are special; they form the

		 * bi-directional USB endpoint 0.

		 *

		 * For those two physical endpoints, we don't allocate a TRB

		 * pool nor do we add them the endpoints list. Due to that, we

		 * shouldn't do these two operations otherwise we would end up

		 * with all sorts of bugs when removing dwc3.ko.

		 */

		if (epnum != 0 && epnum != 1) {

			dwc3_free_trb_pool(dep);



		if (epnum != 0 && epnum != 1)

			list_del(&dep->endpoint.ep_list);

		}



		kfree(dep);

	}

drivers/usb/host/ehci-sched.c

+7 −2
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static inline unsigned char tt_start_uframe(struct ehci_hcd *ehci, __hc32 mask) 
}



static const unsigned char

max_tt_usecs[] = { 125, 125, 125, 125, 125, 125, 125, 25 };

max_tt_usecs[] = { 125, 125, 125, 125, 125, 125, 30, 0 };



/* carryover low/fullspeed bandwidth that crosses uframe boundries */

static inline void carryover_tt_bandwidth(unsigned short tt_usecs[8])
@@ -646,6 +646,10 @@ static void end_unlink_intr(struct ehci_hcd *ehci, struct ehci_qh *qh) 
	/* reschedule QH iff another request is queued */

	if (!list_empty(&qh->qtd_list) && ehci->rh_state == EHCI_RH_RUNNING) {

		rc = qh_schedule(ehci, qh);

		if (rc == 0) {

			qh_refresh(ehci, qh);

			qh_link_periodic(ehci, qh);

		}



		/* An error here likely indicates handshake failure

		 * or no space left in the schedule.  Neither fault
@@ -653,10 +657,11 @@ static void end_unlink_intr(struct ehci_hcd *ehci, struct ehci_qh *qh) 
		 *

		 * FIXME kill the now-dysfunctional queued urbs

		 */

		if (rc != 0)

		else {

			ehci_err(ehci, "can't reschedule qh %p, err %d\n",

					qh, rc);

		}

	}



	/* maybe turn off periodic schedule */

	--ehci->intr_count;

CRA Git | Maintained and supported by SUSTech CRA and CCSE