From: Gustavo F. Padovan <padovan@profusion.mobi>
Date: Tue, 1 Nov 2011 16:48:50 +0000 (-0200)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
X-Git-Tag: next-20111102~40^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f6fbb07c0af5b99132f596c41978a1fc673a8c0b;p=karo-tx-linux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
---

f6fbb07c0af5b99132f596c41978a1fc673a8c0b
diff --cc net/bluetooth/mgmt.c
index 38220a2dc31e,99251d19bf6f..cbc8a6dfa5ed
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@@ -147,11 -142,11 +147,9 @@@ static int read_index_list(struct sock 
  	put_unaligned_le16(count, &rp->num_controllers);
  
  	i = 0;
 -	list_for_each(p, &hci_dev_list) {
 -		struct hci_dev *d = list_entry(p, struct hci_dev, list);
 -
 +	list_for_each_entry(d, &hci_dev_list, list) {
  		hci_del_off_timer(d);
  
- 		set_bit(HCI_MGMT, &d->flags);
- 
  		if (test_bit(HCI_SETUP, &d->flags))
  			continue;