1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index 6dcdb5f598b8..a764ff4e326c 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -35,7 +35,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -47,7 +46,7 @@
 #include <linux/spinlock.h>
 #include <asm/uaccess.h>
 #include <linux/usb.h>
-#include "usb-serial.h"
+#include <linux/usb/serial.h>
 
 static int debug;
 
@@ -257,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;