summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/hci_vhci.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-05-16 15:38:11 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-05-16 15:38:11 -0400
commit05f8f25276ea8c7d41b3649890d6eaf179e67a81 (patch)
tree49ff95cecc0dc2237b773ea8162f247d3d9c8582 /drivers/bluetooth/hci_vhci.c
parent4416f5d2ac986923fcb6e42419c8a048dfda7584 (diff)
parentd839c81372d1f0caee47f87b26a68e91d4ff3847 (diff)
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'drivers/bluetooth/hci_vhci.c')
-rw-r--r--drivers/bluetooth/hci_vhci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 158bfe507da..3f72595a601 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -252,8 +252,9 @@ static int vhci_open(struct inode *inode, struct file *file)
}
file->private_data = data;
+ nonseekable_open(inode, file);
- return nonseekable_open(inode, file);
+ return 0;
}
static int vhci_release(struct inode *inode, struct file *file)