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

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

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

Pull USB fixes from Greg KH:
 "Here are a bunch of USB fixes for 3.13-rc3.

  Nothing major, but we seem to have an argument about a XHCI fix, so
  I'm not including a revert that Sarah requested, because that breaks a
  USB network driver, and I can't revert the USB network driver fix
  without reintroducing other bugs that it fixed.  So as it is,
  everything should now be working.  Worse case, I can revert the XHCI
  fix before 3.13-final is out, but it seems to work well here with my
  testing, so all should be good.

  Other than that, some driver updates based on reports"

* tag 'usb-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (40 commits)
  usb: hub: Use correct reset for wedged USB3 devices that are NOTATTACHED
  usb: ohci-pxa27x: include linux/dma-mapping.h
  USB: cdc-acm: Added support for the Lenovo RD02-D400 USB Modem
  usb: tools: fix a regression issue that gcc can't link to pthread
  USB: switch maintainership of chipidea to Peter
  USB: pl2303: fixed handling of CS5 setting
  USB: ftdi_sio: fixed handling of unsupported CSIZE setting
  USB: mos7840: correct handling of CS5 setting
  USB: spcp8x5: correct handling of CS5 setting
  usb: wusbcore: fix deadlock in wusbhc_gtk_rekey
  usb: wusbcore: do device lookup while holding the hc mutex
  usb: wusbcore: send keepalives to unauthenticated devices
  USB: option: support new huawei devices
  USB: serial: option: blacklist interface 1 for Huawei E173s-6
  usb: xhci: Link TRB must not occur within a USB payload burst
  usb: gadget: f_mass_storage: call try_to_freeze only when its safe
  usb: gadget: tcm_usb_gadget: mark bot_cleanup_old_alt static
  usb: gadget: ffs: fix sparse warning
  usb: gadget: zero: module parameters can be static
  usb: gadget: storage: fix sparse warning
  ...
parents 7d49efe2 2d51f3cd

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -2138,7 +2138,8 @@ S: Maintained 
F:	Documentation/zh_CN/



CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER

M:	Alexander Shishkin <alexander.shishkin@linux.intel.com>

M:	Peter Chen <Peter.Chen@freescale.com>

T:	git://github.com/hzpeterchen/linux-usb.git

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/chipidea/

drivers/usb/class/cdc-acm.c

+2 −0
Original line number Diff line number Diff line
@@ -1515,6 +1515,8 @@ static int acm_reset_resume(struct usb_interface *intf) 


static const struct usb_device_id acm_ids[] = {

	/* quirky and broken devices */

	{ USB_DEVICE(0x17ef, 0x7000), /* Lenovo USB modem */

	.driver_info = NO_UNION_NORMAL, },/* has no union descriptor */

	{ USB_DEVICE(0x0870, 0x0001), /* Metricom GS Modem */

	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */

	},

drivers/usb/core/hub.c

+3 −2
Original line number Diff line number Diff line
@@ -4832,8 +4832,9 @@ static void hub_events(void) 
					hub->ports[i - 1]->child;



				dev_dbg(hub_dev, "warm reset port %d\n", i);

				if (!udev || !(portstatus &

						USB_PORT_STAT_CONNECTION)) {

				if (!udev ||

				    !(portstatus & USB_PORT_STAT_CONNECTION) ||

				    udev->state == USB_STATE_NOTATTACHED) {

					status = hub_port_reset(hub, i,

							NULL, HUB_BH_RESET_TIME,

							true);

drivers/usb/dwc3/ep0.c

+2 −0
Original line number Diff line number Diff line
@@ -459,6 +459,8 @@ static int dwc3_ep0_handle_feature(struct dwc3 *dwc, 
			dep = dwc3_wIndex_to_dep(dwc, wIndex);

			if (!dep)

				return -EINVAL;

			if (set == 0 && (dep->flags & DWC3_EP_WEDGE))

				break;

			ret = __dwc3_gadget_ep_set_halt(dep, set);

			if (ret)

				return -EINVAL;

drivers/usb/dwc3/gadget.c

+1 −4
Original line number Diff line number Diff line
@@ -1200,9 +1200,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value) 
		else

			dep->flags |= DWC3_EP_STALL;

	} else {

		if (dep->flags & DWC3_EP_WEDGE)

			return 0;



		ret = dwc3_send_gadget_ep_cmd(dwc, dep->number,

			DWC3_DEPCMD_CLEARSTALL, &params);

		if (ret)
@@ -1210,7 +1207,7 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value) 
					value ? "set" : "clear",

					dep->name);

		else

			dep->flags &= ~DWC3_EP_STALL;

			dep->flags &= ~(DWC3_EP_STALL | DWC3_EP_WEDGE);

	}



	return ret;