1 files changed, 18 insertions, 13 deletions

diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 097f4e8488fe..9c36f0ece20f 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -27,10 +27,10 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/spinlock.h>
+#include <linux/mutex.h>
 #include <linux/list.h>
 #include <linux/smp_lock.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
 #include <linux/usb.h>
 #include "usb-serial.h"
 #include "pl2303.h"
@@ -189,11 +189,15 @@ static int serial_open (struct tty_struct *tty, struct file * filp)
 
         portNumber = tty->index - serial->minor;
         port = serial->port[portNumber];
-        if (!port)
-                return -ENODEV;
+        if (!port) {
+                retval = -ENODEV;
+                goto bailout_kref_put;
+        }
 
-        if (down_interruptible(&port->sem))
-                return -ERESTARTSYS;
+        if (mutex_lock_interruptible(&port->mutex)) {
+                retval = -ERESTARTSYS;
+                goto bailout_kref_put;
+        }
          
         ++port->open_count;
 
@@ -209,7 +213,7 @@ static int serial_open (struct tty_struct *tty, struct file * filp)
                  * safe because we are called with BKL held */
                 if (!try_module_get(serial->type->driver.owner)) {
                         retval = -ENODEV;
-                        goto bailout_kref_put;
+                        goto bailout_mutex_unlock;
                 }
 
                 /* only call the device specific open if this 
@@ -219,15 +223,16 @@ static int serial_open (struct tty_struct *tty, struct file * filp)
                         goto bailout_module_put;
         }
 
-        up(&port->sem);
+        mutex_unlock(&port->mutex);
         return 0;
 
 bailout_module_put:
         module_put(serial->type->driver.owner);
+bailout_mutex_unlock:
+        port->open_count = 0;
+        mutex_unlock(&port->mutex);
 bailout_kref_put:
         kref_put(&serial->kref, destroy_serial);
-        port->open_count = 0;
-        up(&port->sem);
         return retval;
 }
 
@@ -240,10 +245,10 @@ static void serial_close(struct tty_struct *tty, struct file * filp)
 
         dbg("%s - port %d", __FUNCTION__, port->number);
 
-        down(&port->sem);
+        mutex_lock(&port->mutex);
 
         if (port->open_count == 0) {
-                up(&port->sem);
+                mutex_unlock(&port->mutex);
                 return;
         }
 
@@ -262,7 +267,7 @@ static void serial_close(struct tty_struct *tty, struct file * filp)
                 module_put(port->serial->type->driver.owner);
         }
 
-        up(&port->sem);
+        mutex_unlock(&port->mutex);
         kref_put(&port->serial->kref, destroy_serial);
 }
 
@@ -783,7 +788,7 @@ int usb_serial_probe(struct usb_interface *interface,
                 port->number = i + serial->minor;
                 port->serial = serial;
                 spin_lock_init(&port->lock);
-                sema_init(&port->sem, 1);
+                mutex_init(&port->mutex);
                 INIT_WORK(&port->work, usb_serial_port_softint, port);
                 serial->port[i] = port;
         }