Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth

2011-11-02 15:15:51 -04:00
parent 6a32e4f9dd 6b441fab28
commit c125d5e846
7 changed files with 29 additions and 14 deletions
--- 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;