From 2eb8e4db65b3427cbca017afc316048715affb0f Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Sat, 20 Oct 2007 00:05:19 +0200 Subject: [PATCH] --- yaml --- r: 72580 b: refs/heads/master c: acd2a847e7fee7df11817f67dba75a2802793e5d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/generic.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index df8948a44b7d..a1e099a71bc6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a28dea3accda319d51a1bf4d3e280771d946f78 +refs/heads/master: acd2a847e7fee7df11817f67dba75a2802793e5d diff --git a/trunk/drivers/usb/serial/generic.c b/trunk/drivers/usb/serial/generic.c index 88a2c7dce335..9eb4a65ee4d9 100644 --- a/trunk/drivers/usb/serial/generic.c +++ b/trunk/drivers/usb/serial/generic.c @@ -208,14 +208,15 @@ int usb_serial_generic_write(struct usb_serial_port *port, const unsigned char * /* only do something if we have a bulk out endpoint */ if (serial->num_bulk_out) { - spin_lock_bh(&port->lock); + unsigned long flags; + spin_lock_irqsave(&port->lock, flags); if (port->write_urb_busy) { - spin_unlock_bh(&port->lock); + spin_unlock_irqrestore(&port->lock, flags); dbg("%s - already writing", __FUNCTION__); return 0; } port->write_urb_busy = 1; - spin_unlock_bh(&port->lock); + spin_unlock_irqrestore(&port->lock, flags); count = (count > port->bulk_out_size) ? port->bulk_out_size : count;