Merge 3.9-rc5 into tty-next

[linux-3.10.git] / drivers / usb / serial / usb-serial.c

diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 5d9b178..650be17 100644 (file)
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -542,16 +542,8 @@ static void usb_serial_port_work(struct work_struct *work)
 {
        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 - port %d\n", __func__, port->number);
-
-       tty_wakeup(tty);
-       tty_kref_put(tty);
+       tty_port_tty_wakeup(&port->port);
 }
 
 static void kill_traffic(struct usb_serial_port *port)