From 73c64c530fd8ed3f4c29a96ed5a80d31fc0a20d7 Mon Sep 17 00:00:00 2001
From: Jonathan Corbet <corbet@lwn.net>
Date: Thu, 19 Jun 2008 16:07:51 -0600
Subject: [PATCH] --- yaml --- r: 100401 b: refs/heads/master c:
 dbfb2df7e9fbd6e5ab8cd9b94b27767fe311fa0d h: refs/heads/master i:   100399:
 7f8bf2feb2dc2d2ae69af5d51f6a5df964a7bcb7 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/bluetooth/hci_vhci.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 76e1dc97046b..d6b5ca4289a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d1e3230f4b4a93c6561b0fb5a99bb1eb02227ed
+refs/heads/master: dbfb2df7e9fbd6e5ab8cd9b94b27767fe311fa0d
diff --git a/trunk/drivers/bluetooth/hci_vhci.c b/trunk/drivers/bluetooth/hci_vhci.c
index 7734bc9af3ca..d97700aa54a9 100644
--- a/trunk/drivers/bluetooth/hci_vhci.c
+++ b/trunk/drivers/bluetooth/hci_vhci.c
@@ -318,18 +318,21 @@ static int vhci_release(struct inode *inode, struct file *file)
 static int vhci_fasync(int fd, struct file *file, int on)
 {
 	struct vhci_data *data = file->private_data;
-	int err;
+	int err = 0;
 
+	lock_kernel();
 	err = fasync_helper(fd, file, on, &data->fasync);
 	if (err < 0)
-		return err;
+		goto out;
 
 	if (on)
 		data->flags |= VHCI_FASYNC;
 	else
 		data->flags &= ~VHCI_FASYNC;
 
-	return 0;
+out:
+	unlock_kernel();
+	return err;
 }
 
 static const struct file_operations vhci_fops = {