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

Commit 4742eb3d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are some USB driver fixes and new device ids for 3.18-rc7.

  Full details are in the shortlog, and all of these have been in the
  linux-next tree for a while"

* tag 'usb-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb-quirks: Add reset-resume quirk for MS Wireless Laser Mouse 6000
  usb: xhci: rework root port wake bits if controller isn't allowed to wakeup
  USB: xhci: Reset a halted endpoint immediately when we encounter a stall.
  Revert "xhci: clear root port wake on bits if controller isn't wake-up capable"
  USB: xhci: don't start a halted endpoint before its new dequeue is set
  USB: uas: Add no-uas quirk for Hitachi usb-3 enclosures 4971:1012
  USB: ssu100: fix overrun-error reporting
  USB: keyspan: fix overrun-error reporting
  USB: keyspan: fix tty line-status reporting
  usb: serial: ftdi_sio: add PIDs for Matrix Orbital products
  usb: dwc3: ep0: fix for dead code
  USB: serial: cp210x: add IDs for CEL MeshConnect USB Stick
parents cba3b00d 263e80b4

drivers/usb/core/quirks.c

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* Creative SB Audigy 2 NX */

	{ USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Microsoft Wireless Laser Mouse 6000 Receiver */

	{ USB_DEVICE(0x045e, 0x00e1), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Microsoft LifeCam-VX700 v2.0 */

	{ USB_DEVICE(0x045e, 0x0770), .driver_info = USB_QUIRK_RESET_RESUME },

drivers/usb/dwc3/ep0.c

+4 −4
Original line number Diff line number Diff line
@@ -791,6 +791,10 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc, 


	trb = dwc->ep0_trb;



	r = next_request(&ep0->request_list);

	if (!r)

		return;



	status = DWC3_TRB_SIZE_TRBSTS(trb->size);

	if (status == DWC3_TRBSTS_SETUP_PENDING) {

		dwc3_trace(trace_dwc3_ep0, "Setup Pending received");
@@ -801,10 +805,6 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc, 
		return;

	}



	r = next_request(&ep0->request_list);

	if (!r)

		return;



	ur = &r->request;



	length = trb->size & DWC3_TRB_SIZE_MASK;

drivers/usb/host/xhci-hub.c

+1 −4
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 




#include <linux/slab.h>

#include <linux/device.h>

#include <asm/unaligned.h>



#include "xhci.h"
@@ -1149,9 +1148,7 @@ int xhci_bus_suspend(struct usb_hcd *hcd) 
		 * including the USB 3.0 roothub, but only if CONFIG_PM_RUNTIME

		 * is enabled, so also enable remote wake here.

		 */

		if (hcd->self.root_hub->do_remote_wakeup

				&& device_may_wakeup(hcd->self.controller)) {



		if (hcd->self.root_hub->do_remote_wakeup) {

			if (t1 & PORT_CONNECT) {

				t2 |= PORT_WKOC_E | PORT_WKDISC_E;

				t2 &= ~PORT_WKCONN_E;

drivers/usb/host/xhci-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static int xhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup) 
	if (xhci->quirks & XHCI_COMP_MODE_QUIRK)

		pdev->no_d3cold = true;



	return xhci_suspend(xhci);

	return xhci_suspend(xhci, do_wakeup);

}



static int xhci_pci_resume(struct usb_hcd *hcd, bool hibernated)

drivers/usb/host/xhci-plat.c

+9 −1
Original line number Diff line number Diff line
@@ -204,7 +204,15 @@ static int xhci_plat_suspend(struct device *dev) 
	struct usb_hcd	*hcd = dev_get_drvdata(dev);

	struct xhci_hcd	*xhci = hcd_to_xhci(hcd);



	return xhci_suspend(xhci);

	/*

	 * xhci_suspend() needs `do_wakeup` to know whether host is allowed

	 * to do wakeup during suspend. Since xhci_plat_suspend is currently

	 * only designed for system suspend, device_may_wakeup() is enough

	 * to dertermine whether host is allowed to do wakeup. Need to

	 * reconsider this when xhci_plat_suspend enlarges its scope, e.g.,

	 * also applies to runtime suspend.

	 */

	return xhci_suspend(xhci, device_may_wakeup(dev));

}



static int xhci_plat_resume(struct device *dev)