diff --git a/[refs] b/[refs] index 118fdfbf9abc..7a146b023e17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 684c6e30d389f67ef727c8f5a7b23a09b4cb02e4 +refs/heads/master: 8b0127b2082601e40295045414a8318f2c8ee5a0 diff --git a/trunk/drivers/usb/serial/pl2303.c b/trunk/drivers/usb/serial/pl2303.c index 28037c1af93e..18d1c44faa51 100644 --- a/trunk/drivers/usb/serial/pl2303.c +++ b/trunk/drivers/usb/serial/pl2303.c @@ -456,21 +456,10 @@ static void pl2303_dtr_rts(struct usb_serial_port *port, int on) static void pl2303_close(struct usb_serial_port *port) { - unsigned long flags; - dbg("%s - port %d", __func__, port->number); - spin_lock_irqsave(&port->lock, flags); - /* clear out any remaining data in the buffer */ - kfifo_reset_out(&port->write_fifo); - spin_unlock_irqrestore(&port->lock, flags); - - /* shutdown our urbs */ - dbg("%s - shutting down urbs", __func__); - usb_kill_urb(port->write_urb); - usb_kill_urb(port->read_urb); + usb_serial_generic_close(port); usb_kill_urb(port->interrupt_in_urb); - } static int pl2303_open(struct tty_struct *tty, struct usb_serial_port *port)