diff options
| author | Johan Hovold <jhovold@gmail.com> | 2010-03-18 01:00:44 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-21 00:21:33 +0400 |
| commit | ec3ee5086c1e1b883292eaf795b5c1b0c25bcffe (patch) | |
| tree | 676df22a9390c9147f1c131d5a091cb4d498d812 /drivers/usb/serial/generic.c | |
| parent | 50dbb8528757b1977efd5d270ed9d262cbbef87d (diff) | |
| download | linux-ec3ee5086c1e1b883292eaf795b5c1b0c25bcffe.tar.xz | |
USB: serial: clear fifo on close
Make sure fifo is emptied on close.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/generic.c')
| -rw-r--r-- | drivers/usb/serial/generic.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index 2a3196a2c66c..583244bd84b1 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c @@ -156,13 +156,19 @@ EXPORT_SYMBOL_GPL(usb_serial_generic_open); static void generic_cleanup(struct usb_serial_port *port) { struct usb_serial *serial = port->serial; + unsigned long flags; dbg("%s - port %d", __func__, port->number); if (serial->dev) { /* shutdown any bulk transfers that might be going on */ - if (port->bulk_out_size) + if (port->bulk_out_size) { usb_kill_urb(port->write_urb); + + spin_lock_irqsave(&port->lock, flags); + kfifo_reset_out(&port->write_fifo); + spin_unlock_irqrestore(&port->lock, flags); + } if (port->bulk_in_size) usb_kill_urb(port->read_urb); } |