aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/mgmt.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-11-02 15:15:51 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-11-02 15:15:51 -0400
commitc125d5e846894043361c0c89c1140be8fd6600b7 (patch)
tree8c613b696dc65b047ae6660e55abcd0c008be490 /net/bluetooth/mgmt.c
parentvlan: allow nested vlan_do_receive() (diff)
parentBluetooth: bfusb: Fix error path on firmware load (diff)
downloadlinux-dev-c125d5e846894043361c0c89c1140be8fd6600b7.tar.xz
linux-dev-c125d5e846894043361c0c89c1140be8fd6600b7.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r--net/bluetooth/mgmt.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 5a94eec06caa..5caff4d47596 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -147,8 +147,6 @@ static int read_index_list(struct sock *sk)
hci_del_off_timer(d);
- set_bit(HCI_MGMT, &d->flags);
-
if (test_bit(HCI_SETUP, &d->flags))
continue;