Merge branch 'next' into for-linus

[karo-tx-linux.git] / net / bluetooth / rfcomm / tty.c

diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index 403ec09f480a2a72983b0b1b9db0222fd6e86742..8e385a0ae60e0bd6e4b1ed7615905a7170c4a8bc 100644 (file)
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -70,7 +70,7 @@ struct rfcomm_dev {
 };
 
 static LIST_HEAD(rfcomm_dev_list);
-static DEFINE_SPINLOCK(rfcomm_dev_lock);
+static DEFINE_MUTEX(rfcomm_dev_lock);
 
 static void rfcomm_dev_data_ready(struct rfcomm_dlc *dlc, struct sk_buff *skb);
 static void rfcomm_dev_state_change(struct rfcomm_dlc *dlc, int err);
@@ -96,9 +96,9 @@ static void rfcomm_dev_destruct(struct tty_port *port)
        if (dev->tty_dev)
                tty_unregister_device(rfcomm_tty_driver, dev->id);
 
-       spin_lock(&rfcomm_dev_lock);
+       mutex_lock(&rfcomm_dev_lock);
        list_del(&dev->list);
-       spin_unlock(&rfcomm_dev_lock);
+       mutex_unlock(&rfcomm_dev_lock);
 
        kfree(dev);
 
@@ -161,14 +161,14 @@ static struct rfcomm_dev *rfcomm_dev_get(int id)
 {
        struct rfcomm_dev *dev;
 
-       spin_lock(&rfcomm_dev_lock);
+       mutex_lock(&rfcomm_dev_lock);
 
        dev = __rfcomm_dev_lookup(id);
 
        if (dev && !tty_port_get(&dev->port))
                dev = NULL;
 
-       spin_unlock(&rfcomm_dev_lock);
+       mutex_unlock(&rfcomm_dev_lock);
 
        return dev;
 }
@@ -224,7 +224,7 @@ static struct rfcomm_dev *__rfcomm_dev_add(struct rfcomm_dev_req *req,
        if (!dev)
                return ERR_PTR(-ENOMEM);
 
-       spin_lock(&rfcomm_dev_lock);
+       mutex_lock(&rfcomm_dev_lock);
 
        if (req->dev_id < 0) {
                dev->id = 0;
@@ -305,11 +305,11 @@ static struct rfcomm_dev *__rfcomm_dev_add(struct rfcomm_dev_req *req,
           holds reference to this module. */
        __module_get(THIS_MODULE);
 
-       spin_unlock(&rfcomm_dev_lock);
+       mutex_unlock(&rfcomm_dev_lock);
        return dev;
 
 out:
-       spin_unlock(&rfcomm_dev_lock);
+       mutex_unlock(&rfcomm_dev_lock);
        kfree(dev);
        return ERR_PTR(err);
 }
@@ -524,7 +524,7 @@ static int rfcomm_get_dev_list(void __user *arg)
 
        di = dl->dev_info;
 
-       spin_lock(&rfcomm_dev_lock);
+       mutex_lock(&rfcomm_dev_lock);
 
        list_for_each_entry(dev, &rfcomm_dev_list, list) {
                if (!tty_port_get(&dev->port))
@@ -540,7 +540,7 @@ static int rfcomm_get_dev_list(void __user *arg)
                        break;
        }
 
-       spin_unlock(&rfcomm_dev_lock);
+       mutex_unlock(&rfcomm_dev_lock);
 
        dl->dev_num = n;
        size = sizeof(*dl) + n * sizeof(*di);