From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 27 Sep 2013 17:09:17 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.12-rc4~30^2~39^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0a878747e18d4d14c5b772dcddddd86bb4c26f8f;p=linux.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem

Also fixed-up a badly indented closing brace...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

0a878747e18d4d14c5b772dcddddd86bb4c26f8f
diff --cc net/bluetooth/hci_core.c
index 634debab4d54,1b66547a3ca6..fb7356fcfe51
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@@ -1566,10 -1570,13 +1570,13 @@@ static int hci_rfkill_set_block(void *d
  
  	BT_DBG("%p name %s blocked %d", hdev, hdev->name, blocked);
  
- 	if (!blocked)
- 		return 0;
- 
- 	hci_dev_do_close(hdev);
+ 	if (blocked) {
+ 		set_bit(HCI_RFKILLED, &hdev->dev_flags);
+ 		if (!test_bit(HCI_SETUP, &hdev->dev_flags))
+ 			hci_dev_do_close(hdev);
+ 	} else {
+ 		clear_bit(HCI_RFKILLED, &hdev->dev_flags);
 -}
++	}
  
  	return 0;
  }