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

Commit 3c688149 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (48 commits)
  USB: Fix Corruption issue in USB ftdi driver ftdi_sio.c
  USB: option: add PID of Huawei E173s 3G modem
  OHCI: final fix for NVIDIA problems (I hope)
  USB: option: release new PID for ZTE 3G modem
  usb: Netlogic: Fix HC_LENGTH call in ehci-xls.c
  USB: storage: ene_ub6250: fix compile warnings
  USB: option: add id for 3G dongle Model VT1000 of Viettel
  USB: serial: pl2303: rm duplicate id
  USB: pch_udc: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
  USB: pch_udc: Support new device LAPIS Semiconductor ML7831 IOH
  usb-storage: Accept 8020i-protocol commands longer than 12 bytes
  USB: quirks: adding more quirky webcams to avoid squeaky audio
  powerpc/usb: fix type cast for address of ioremap to compatible with 64-bit
  USB: at91: at91-ohci: fix set/get power
  USB: cdc-acm: Fix disconnect() vs close() race
  USB: add quirk for Logitech C600 web cam
  USB: EHCI: fix HUB TT scheduling issue with iso transfer
  USB: XHCI: resume root hubs when the controller resumes
  USB: workaround for bug in old version of GCC
  USB: ark3116 initialisation fix
  ...
parents 3b9abc7e b1ffb4c8

drivers/usb/class/cdc-acm.c

+5 −3
Original line number Diff line number Diff line
@@ -539,7 +539,6 @@ static void acm_port_down(struct acm *acm) 
{

	int i;



	mutex_lock(&open_mutex);

	if (acm->dev) {

		usb_autopm_get_interface(acm->control);

		acm_set_control(acm, acm->ctrlout = 0);
@@ -551,14 +550,15 @@ static void acm_port_down(struct acm *acm) 
		acm->control->needs_remote_wakeup = 0;

		usb_autopm_put_interface(acm->control);

	}

	mutex_unlock(&open_mutex);

}



static void acm_tty_hangup(struct tty_struct *tty)

{

	struct acm *acm = tty->driver_data;

	tty_port_hangup(&acm->port);

	mutex_lock(&open_mutex);

	acm_port_down(acm);

	mutex_unlock(&open_mutex);

}



static void acm_tty_close(struct tty_struct *tty, struct file *filp)
@@ -569,8 +569,9 @@ static void acm_tty_close(struct tty_struct *tty, struct file *filp) 
	   shutdown */

	if (!acm)

		return;

	if (tty_port_close_start(&acm->port, tty, filp) == 0) {



	mutex_lock(&open_mutex);

	if (tty_port_close_start(&acm->port, tty, filp) == 0) {

		if (!acm->dev) {

			tty_port_tty_set(&acm->port, NULL);

			acm_tty_unregister(acm);
@@ -582,6 +583,7 @@ static void acm_tty_close(struct tty_struct *tty, struct file *filp) 
	acm_port_down(acm);

	tty_port_close_end(&acm->port, tty);

	tty_port_tty_set(&acm->port, NULL);

	mutex_unlock(&open_mutex);

}



static int acm_tty_write(struct tty_struct *tty,

drivers/usb/core/hub.c

+6 −0
Original line number Diff line number Diff line
@@ -813,6 +813,12 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) 
					USB_PORT_FEAT_C_PORT_LINK_STATE);

		}



		if ((portchange & USB_PORT_STAT_C_BH_RESET) &&

				hub_is_superspeed(hub->hdev)) {

			need_debounce_delay = true;

			clear_port_feature(hub->hdev, port1,

					USB_PORT_FEAT_C_BH_PORT_RESET);

		}

		/* We can forget about a "removed" device when there's a

		 * physical disconnect or the connect status changes.

		 */

drivers/usb/core/quirks.c

+27 −0
Original line number Diff line number Diff line
@@ -50,15 +50,42 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* Logitech Webcam B/C500 */

	{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Logitech Webcam C600 */

	{ USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Logitech Webcam Pro 9000 */

	{ USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Logitech Webcam C905 */

	{ USB_DEVICE(0x046d, 0x080a), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Logitech Webcam C210 */

	{ USB_DEVICE(0x046d, 0x0819), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Logitech Webcam C260 */

	{ USB_DEVICE(0x046d, 0x081a), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Logitech Webcam C310 */

	{ USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Logitech Webcam C910 */

	{ USB_DEVICE(0x046d, 0x0821), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Logitech Webcam C160 */

	{ USB_DEVICE(0x046d, 0x0824), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Logitech Webcam C270 */

	{ USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Logitech Quickcam Pro 9000 */

	{ USB_DEVICE(0x046d, 0x0990), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Logitech Quickcam E3500 */

	{ USB_DEVICE(0x046d, 0x09a4), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Logitech Quickcam Vision Pro */

	{ USB_DEVICE(0x046d, 0x09a6), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Logitech Harmony 700-series */

	{ USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },

drivers/usb/dwc3/gadget.c

+1 −0
Original line number Diff line number Diff line
@@ -1284,6 +1284,7 @@ static int __devinit dwc3_gadget_init_endpoints(struct dwc3 *dwc) 
			int		ret;



			dep->endpoint.maxpacket = 1024;

			dep->endpoint.max_streams = 15;

			dep->endpoint.ops = &dwc3_gadget_ep_ops;

			list_add_tail(&dep->endpoint.ep_list,

					&dwc->gadget.ep_list);

drivers/usb/gadget/Kconfig

+5 −4
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ config USB_LANGWELL 
	   gadget drivers to also be dynamically linked.



config USB_EG20T

	tristate "Intel EG20T PCH/OKI SEMICONDUCTOR ML7213 IOH UDC"

	tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7213/ML7831) UDC"

	depends on PCI

	select USB_GADGET_DUALSPEED

	help
@@ -485,10 +485,11 @@ config USB_EG20T 
	  This driver dose not support interrupt transfer or isochronous

	  transfer modes.



	  This driver also can be used for OKI SEMICONDUCTOR's ML7213 which is

	  This driver also can be used for LAPIS Semiconductor's ML7213 which is

	  for IVI(In-Vehicle Infotainment) use.

	  ML7213 is companion chip for Intel Atom E6xx series.

	  ML7213 is completely compatible for Intel EG20T PCH.

	  ML7831 is for general purpose use.

	  ML7213/ML7831 is companion chip for Intel Atom E6xx series.

	  ML7213/ML7831 is completely compatible for Intel EG20T PCH.



config USB_CI13XXX_MSM

	tristate "MIPS USB CI13xxx for MSM"