diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-22 16:07:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-22 16:07:23 -0400 |
| commit | c3719a1ef52eb1aadf77b7557cc9ca08124d8818 (patch) | |
| tree | 9fc3737751948a71cde8f8ff64d1ca4cb0f44932 /drivers/bluetooth/hci_vhci.c | |
| parent | 35c579070a349cfe54f9e09a47df2c5b68d58469 (diff) | |
| parent | a0d0d1685f9763ab26a394df3ab84026b39a06a7 (diff) | |
| download | linux-c3719a1ef52eb1aadf77b7557cc9ca08124d8818.tar.gz linux-c3719a1ef52eb1aadf77b7557cc9ca08124d8818.tar.bz2 linux-c3719a1ef52eb1aadf77b7557cc9ca08124d8818.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John says:
--------------------
I apologize for not having sent this sooner. FWIW, I was in a car
somewhere between Illinois and North Carolina for most of the day
Sunday and Monday... :-)
This is (obviously) the last non-fix pull request for wireless bits
intended for 3.5. It includes AP support for mwifiex, a variety of HCI
and other updates for NFC, some brcmfmac and brcmsmac refactoring,
a large batch of ssb and bcma updates, a batch of ath6kl updates,
some cfg80211 and mac80211 updates/refactoring from Johannes Berg,
a rather large collection of Bluetooth updates by way of Gustavo,
and a variety of other bits here and there.
--------------------
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/bluetooth/hci_vhci.c')
| -rw-r--r-- | drivers/bluetooth/hci_vhci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c index 158bfe507da7..3f72595a6017 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) |