1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 1fd5c5a9f2ef..d954ec34b018 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -28,7 +28,6 @@
  */
 
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -40,7 +39,7 @@
 #include <linux/spinlock.h>
 #include <asm/uaccess.h>
 #include <linux/usb.h>
-#include "usb-serial.h"
+#include <linux/usb/serial.h>
 
 #define CYBERJACK_LOCAL_BUF_SIZE 32
 
@@ -215,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);