diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-28 19:02:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-28 19:02:24 +0100 |
| commit | b13379758f17e66d60f1f288bf917762c54ebd2f (patch) | |
| tree | fe9d93eb4adc9b73f8c512b3fad2438de56c5434 | |
| parent | Merge branch 'usb-linus' into usb-next (diff) | |
| download | linux-b13379758f17e66d60f1f288bf917762c54ebd2f.tar.xz linux-b13379758f17e66d60f1f288bf917762c54ebd2f.zip | |
Revert "USB: serial: fix hang when opening port"
This reverts commit eba0e3c3a0ba7b96f01cbe997680f6a4401a0bfc.
When merged together (usb-linus and usb-next), this fix isn't needed and
causes a build error. Revert the commit to solve the build issue.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Ming Lei <tom.leiming@gmail.com>
Cc: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/serial/usb-serial.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 57e6f53a3dac..5eb96df8de05 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c @@ -892,7 +892,6 @@ static int usb_serial_probe(struct usb_interface *interface, port->port.ops = &serial_port_ops; port->serial = serial; spin_lock_init(&port->lock); - init_waitqueue_head(&port->delta_msr_wait); /* Keep this for private driver use for the moment but should probably go away */ INIT_WORK(&port->work, usb_serial_port_work); |