7 files changed, 21 insertions, 21 deletions

diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 6286aba86fae..d954ec34b018 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -214,14 +214,14 @@ static int cyberjack_write (struct usb_serial_port *port, const unsigned char *b
                 return (0);
         }
 
-        spin_lock(&port->lock);
+        spin_lock_bh(&port->lock);
         if (port->write_urb_busy) {
-                spin_unlock(&port->lock);
+                spin_unlock_bh(&port->lock);
                 dbg("%s - already writing", __FUNCTION__);
                 return 0;
         }
         port->write_urb_busy = 1;
-        spin_unlock(&port->lock);
+        spin_unlock_bh(&port->lock);
 
         spin_lock_irqsave(&priv->lock, flags);
 
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 172713556393..21cbaa0fb96b 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -175,14 +175,14 @@ 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(&port->lock);
+                spin_lock_bh(&port->lock);
                 if (port->write_urb_busy) {
-                        spin_unlock(&port->lock);
+                        spin_unlock_bh(&port->lock);
                         dbg("%s - already writing", __FUNCTION__);
                         return 0;
                 }
                 port->write_urb_busy = 1;
-                spin_unlock(&port->lock);
+                spin_unlock_bh(&port->lock);
 
                 count = (count > port->bulk_out_size) ? port->bulk_out_size : count;
 
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index 87306cb6f9f5..812bc213a963 100644
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
@@ -394,14 +394,14 @@ static int ipw_write(struct usb_serial_port *port, const unsigned char *buf, int
                 return 0;
         }
 
-        spin_lock(&port->lock);
+        spin_lock_bh(&port->lock);
         if (port->write_urb_busy) {
-                spin_unlock(&port->lock);
+                spin_unlock_bh(&port->lock);
                 dbg("%s - already writing", __FUNCTION__);
                 return 0;
         }
         port->write_urb_busy = 1;
-        spin_unlock(&port->lock);
+        spin_unlock_bh(&port->lock);
 
         count = min(count, port->bulk_out_size);
         memcpy(port->bulk_out_buffer, buf, count);
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index 1738b0b6a376..1b348df388ed 100644
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -342,14 +342,14 @@ static int ir_write (struct usb_serial_port *port, const unsigned char *buf, int
         if (count == 0)
                 return 0;
 
-        spin_lock(&port->lock);
+        spin_lock_bh(&port->lock);
         if (port->write_urb_busy) {
-                spin_unlock(&port->lock);
+                spin_unlock_bh(&port->lock);
                 dbg("%s - already writing", __FUNCTION__);
                 return 0;
         }
         port->write_urb_busy = 1;
-        spin_unlock(&port->lock);
+        spin_unlock_bh(&port->lock);
 
         transfer_buffer = port->write_urb->transfer_buffer;
         transfer_size = min(count, port->bulk_out_size - 1);
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 49b8dc039d1f..59e777f1e8fd 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -518,13 +518,13 @@ static int keyspan_pda_write(struct usb_serial_port *port,
            the TX urb is in-flight (wait until it completes)
            the device is full (wait until it says there is room)
         */
-        spin_lock(&port->lock);
+        spin_lock_bh(&port->lock);
         if (port->write_urb_busy || priv->tx_throttled) {
-                spin_unlock(&port->lock);
+                spin_unlock_bh(&port->lock);
                 return 0;
         }
         port->write_urb_busy = 1;
-        spin_unlock(&port->lock);
+        spin_unlock_bh(&port->lock);
 
         /* At this point the URB is in our control, nobody else can submit it
            again (the only sudden transition was the one from EINPROGRESS to
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index e49f40913c27..a764ff4e326c 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -256,14 +256,14 @@ static int omninet_write (struct usb_serial_port *port, const unsigned char *buf
                 return (0);
         }
 
-        spin_lock(&wport->lock);
+        spin_lock_bh(&wport->lock);
         if (wport->write_urb_busy) {
-                spin_unlock(&wport->lock);
+                spin_unlock_bh(&wport->lock);
                 dbg("%s - already writing", __FUNCTION__);
                 return 0;
         }
         wport->write_urb_busy = 1;
-        spin_unlock(&wport->lock);
+        spin_unlock_bh(&wport->lock);
 
         count = (count > OMNINET_BULKOUTSIZE) ? OMNINET_BULKOUTSIZE : count;
 
diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c
index 789771ecdb11..1e07dfad6853 100644
--- a/drivers/usb/serial/safe_serial.c
+++ b/drivers/usb/serial/safe_serial.c
@@ -298,14 +298,14 @@ static int safe_write (struct usb_serial_port *port, const unsigned char *buf, i
                 dbg ("%s - write request of 0 bytes", __FUNCTION__);
                 return (0);
         }
-        spin_lock(&port->lock);
+        spin_lock_bh(&port->lock);
         if (port->write_urb_busy) {
-                spin_unlock(&port->lock);
+                spin_unlock_bh(&port->lock);
                 dbg("%s - already writing", __FUNCTION__);
                 return 0;
         }
         port->write_urb_busy = 1;
-        spin_unlock(&port->lock);
+        spin_unlock_bh(&port->lock);
 
         packet_length = port->bulk_out_size;    // get max packetsize