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

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

Pull USB driver fixes from Greg KH:
 "Here are some small USB fixes for 4.6-rc4.

  Mostly xhci fixes for reported issues, a UAS bug that has hit a number
  of people, including stable tree users, and a few other minor things.

  All have been in linux-next for a while with no reported issues"

* tag 'usb-4.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: hcd: out of bounds access in for_each_companion
  USB: uas: Add a new NO_REPORT_LUNS quirk
  USB: uas: Limit qdepth at the scsi-host level
  doc: usb: Fix typo in gadget_multi documentation
  usb: host: xhci-plat: Make enum xhci_plat_type start at a non zero value
  xhci: fix 10 second timeout on removal of PCI hotpluggable xhci controllers
  usb: xhci: fix wild pointers in xhci_mem_cleanup
  usb: host: xhci-plat: fix cannot work if R-Car Gen2/3 run on above 4GB phys
  usb: host: xhci: add a new quirk XHCI_NO_64BIT_SUPPORT
  xhci: resume USB 3 roothub first
  usb: xhci: applying XHCI_PME_STUCK_QUIRK to Intel BXT B0 host
  cdc-acm: fix crash if flushed with nothing buffered
parents 306a63be e86103a7

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -4077,6 +4077,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
					sector if the number is odd);

				i = IGNORE_DEVICE (don't bind to this

					device);

				j = NO_REPORT_LUNS (don't use report luns

					command, uas only);

				l = NOT_LOCKABLE (don't try to lock and

					unlock ejectable media);

				m = MAX_SECTORS_64 (don't transfer more

Documentation/usb/gadget_multi.txt

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ For the gadget two work under Windows two conditions have to be met: 
First of all, Windows need to detect the gadget as an USB composite

gadget which on its own have some conditions[4].  If they are met,

Windows lets USB Generic Parent Driver[5] handle the device which then

tries to much drivers for each individual interface (sort of, don't

tries to match drivers for each individual interface (sort of, don't

get into too many details).



The good news is: you do not have to worry about most of the

drivers/usb/class/cdc-acm.c

+4 −0
Original line number Diff line number Diff line
@@ -744,11 +744,15 @@ static void acm_tty_flush_chars(struct tty_struct *tty) 
	int err;

	unsigned long flags;



	if (!cur) /* nothing to do */

		return;



	acm->putbuffer = NULL;

	err = usb_autopm_get_interface_async(acm->control);

	spin_lock_irqsave(&acm->write_lock, flags);

	if (err < 0) {

		cur->use = 0;

		acm->putbuffer = cur;

		goto out;

	}

drivers/usb/core/hcd-pci.c

+9 −0
Original line number Diff line number Diff line
@@ -73,6 +73,15 @@ static void for_each_companion(struct pci_dev *pdev, struct usb_hcd *hcd, 
		if (companion->bus != pdev->bus ||

				PCI_SLOT(companion->devfn) != slot)

			continue;



		/*

		 * Companion device should be either UHCI,OHCI or EHCI host

		 * controller, otherwise skip.

		 */

		if (companion->class != CL_UHCI && companion->class != CL_OHCI &&

				companion->class != CL_EHCI)

			continue;



		companion_hcd = pci_get_drvdata(companion);

		if (!companion_hcd || !companion_hcd->self.root_hub)

			continue;

drivers/usb/host/xhci-mem.c

+6 −0
Original line number Diff line number Diff line
@@ -1861,6 +1861,12 @@ no_bw: 
	kfree(xhci->rh_bw);

	kfree(xhci->ext_caps);



	xhci->usb2_ports = NULL;

	xhci->usb3_ports = NULL;

	xhci->port_array = NULL;

	xhci->rh_bw = NULL;

	xhci->ext_caps = NULL;



	xhci->page_size = 0;

	xhci->page_shift = 0;

	xhci->bus_state[0].bus_suspended = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE