summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-06-08 14:24:03 +0200
committerMarcel Holtmann <marcel@holtmann.org>2009-06-08 14:50:01 +0200
commit3857abc622102b808de11ff3393d541b826ab952 (patch)
tree3e8f771a12a4da67455f2aef6c25efb8a7903f3a /drivers/bluetooth
parentBluetooth: Use wait_event_interruptible for virtual driver (diff)
downloadlinux-3857abc622102b808de11ff3393d541b826ab952.tar.xz
linux-3857abc622102b808de11ff3393d541b826ab952.zip
Bluetooth: Remove BKL from open callback of virtual driver
The BKL push down added some BKL into the open callback of the virtual driver. The driver is really simple and need no such locking and so just remove it. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/hci_vhci.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 0f5e04934cec..7ebdb1d30939 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -246,11 +246,9 @@ static int vhci_open(struct inode *inode, struct file *file)
skb_queue_head_init(&data->readq);
init_waitqueue_head(&data->read_wait);
- lock_kernel();
hdev = hci_alloc_dev();
if (!hdev) {
kfree(data);
- unlock_kernel();
return -ENOMEM;
}
@@ -271,12 +269,10 @@ static int vhci_open(struct inode *inode, struct file *file)
BT_ERR("Can't register HCI device");
kfree(data);
hci_free_dev(hdev);
- unlock_kernel();
return -EBUSY;
}
file->private_data = data;
- unlock_kernel();
return nonseekable_open(inode, file);
}