From 001a84207a15e8afd13c027db94d536533bd2541 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 8 Jun 2009 14:24:03 +0200 Subject: [PATCH] --- yaml --- r: 150857 b: refs/heads/master c: 3857abc622102b808de11ff3393d541b826ab952 h: refs/heads/master i: 150855: 52cebc02f4964ec424dbb0256583e04af99ceefe v: v3 --- [refs] | 2 +- trunk/drivers/bluetooth/hci_vhci.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9a91086c506c..1ed24f450031 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4db7589f3d88c09d740560f1dcf2d4d843d918f2 +refs/heads/master: 3857abc622102b808de11ff3393d541b826ab952 diff --git a/trunk/drivers/bluetooth/hci_vhci.c b/trunk/drivers/bluetooth/hci_vhci.c index 0f5e04934cec..7ebdb1d30939 100644 --- a/trunk/drivers/bluetooth/hci_vhci.c +++ b/trunk/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); }