From 04ef8b62069eed0e4bc1ba4b9afc668c6c53bf3d Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Wed, 17 Mar 2010 23:00:44 +0100 Subject: [PATCH] --- yaml --- r: 195343 b: refs/heads/master c: ec3ee5086c1e1b883292eaf795b5c1b0c25bcffe h: refs/heads/master i: 195341: 558dcf7198518e33ef975aeaf80ea90b46f9d9ba 195339: 9115856e0d1337b43323e4a2565b885f8d6f8d09 195335: 1322dbad5ff6e85d6da07bac7c772c2457c0a8aa 195327: 184b6469b15d6ca747b06b803f2d9bef1d0d2602 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/generic.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6817da1728f1..3b8c874d6512 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50dbb8528757b1977efd5d270ed9d262cbbef87d +refs/heads/master: ec3ee5086c1e1b883292eaf795b5c1b0c25bcffe diff --git a/trunk/drivers/usb/serial/generic.c b/trunk/drivers/usb/serial/generic.c index 2a3196a2c66c..583244bd84b1 100644 --- a/trunk/drivers/usb/serial/generic.c +++ b/trunk/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); }