From d0ad841891762e89d03f08383c4a2f09b04834aa Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Wed, 17 Mar 2010 23:00:43 +0100 Subject: [PATCH] --- yaml --- r: 195342 b: refs/heads/master c: 50dbb8528757b1977efd5d270ed9d262cbbef87d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/generic.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d1f93015664a..6817da1728f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30af7fb5a40f8724c130428473edffa73170e04c +refs/heads/master: 50dbb8528757b1977efd5d270ed9d262cbbef87d diff --git a/trunk/drivers/usb/serial/generic.c b/trunk/drivers/usb/serial/generic.c index 8f78d7b8e888..2a3196a2c66c 100644 --- a/trunk/drivers/usb/serial/generic.c +++ b/trunk/drivers/usb/serial/generic.c @@ -519,10 +519,13 @@ void usb_serial_generic_write_bulk_callback(struct urb *urb) port->write_urb_busy = 0; spin_unlock_irqrestore(&port->lock, flags); - if (status) + if (status) { + spin_lock_irqsave(&port->lock, flags); kfifo_reset_out(&port->write_fifo); - else + spin_unlock_irqrestore(&port->lock, flags); + } else { usb_serial_generic_write_start(port); + } } if (status)