From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Apr 2013 19:19:23 +0000 (-0700)
Subject: Merge tag 'usb-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ec25e246b94a3233ab064994ef05a170bdba0e7c;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'usb-3.10-rc1' of git://git./linux/kernel/git/gregkh/usb

Pull USB patches from Greg Kroah-Hartman:
 "Here's the big USB pull request for 3.10-rc1.

  Lots of USB patches here, the majority being USB gadget changes and
  USB-serial driver cleanups, the rest being ARM build fixes / cleanups,
  and individual driver updates.  We also finally got some chipidea
  fixes, which have been delayed for a number of kernel releases, as the
  maintainer has now reappeared.

  All of these have been in linux-next for a while"

* tag 'usb-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (568 commits)
  USB: ehci-msm: USB_MSM_OTG needs USB_PHY
  USB: OHCI: avoid conflicting platform drivers
  USB: OMAP: ISP1301 needs USB_PHY
  USB: lpc32xx: ISP1301 needs USB_PHY
  USB: ftdi_sio: enable two UART ports on ST Microconnect Lite
  usb: phy: tegra: don't call into tegra-ehci directly
  usb: phy: phy core cannot yet be a module
  USB: Fix initconst in ehci driver
  usb-storage: CY7C68300A chips do not support Cypress ATACB
  USB: serial: option: Added support Olivetti Olicard 145
  USB: ftdi_sio: correct ST Micro Connect Lite PIDs
  ARM: mxs_defconfig: add CONFIG_USB_PHY
  ARM: imx_v6_v7_defconfig: add CONFIG_USB_PHY
  usb: phy: remove exported function from __init section
  usb: gadget: zero: put function instances on unbind
  usb: gadget: f_sourcesink.c: correct a copy-paste misnomer
  usb: gadget: cdc2: fix error return code in cdc_do_config()
  usb: gadget: multi: fix error return code in rndis_do_config()
  usb: gadget: f_obex: fix error return code in obex_bind()
  USB: storage: convert to use module_usb_driver()
  ...
---

ec25e246b94a3233ab064994ef05a170bdba0e7c
diff --cc drivers/usb/serial/usb-serial.c
index 650be17a68f2,5eb96df8de05..cf75beb1251b
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@@ -542,11 -538,19 +538,11 @@@ static void usb_serial_port_work(struc
  {
  	struct usb_serial_port *port =
  		container_of(work, struct usb_serial_port, work);
 -	struct tty_struct *tty;
  
 -	tty = tty_port_tty_get(&port->port);
 -	if (!tty)
 -		return;
 -
 -	dev_dbg(tty->dev, "%s\n", __func__);
 -
 -	tty_wakeup(tty);
 -	tty_kref_put(tty);
 +	tty_port_tty_wakeup(&port->port);
  }
  
- static void kill_traffic(struct usb_serial_port *port)
+ static void usb_serial_port_poison_urbs(struct usb_serial_port *port)
  {
  	int i;