Merge tag 'master-2014-12-15' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

John W. Linville says:

====================
pull request: wireless 2014-12-16

Please pull this batch of fixes intended for the 3.19 stream!

For the Bluetooth bits, Johan says:

"The patches consist of:

 - Coccinelle warning fix
 - hci_dev_lock/unlock fixes
 - Fixes for pending mgmt command handling
 - Fixes for properly following the force_lesc_support switch
 - Fix for a Microsoft branded Broadcom adapter
 - New device id for Atheros AR3012
 - Fix for BR/EDR Secure Connections enabling"

Along with that...

Brian Norris avoids leaking some kernel memory contents via printk in brcmsmac.

Julia Lawall corrects some misspellings in a few drivers.

Larry Finger gives us one more rtlwifi fix to correct a porting oversight.

Wei Yongjun fixes a sparse warning in rtlwifi.

Please let me know if there are problems!
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 10 deletions

diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index b6ec51923b20..50033aa7c7d5 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -381,18 +381,15 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
 
         res = pcmcia_read_config_byte(hw_priv->link, CISREG_COR, &old_cor);
         if (res != 0) {
-                printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 1 "
-                       "(%d)\n", res);
+                printk(KERN_DEBUG "%s failed 1 (%d)\n", __func__, res);
                 return;
         }
-        printk(KERN_DEBUG "prism2_pccard_genesis_sreset: original COR %02x\n",
-                old_cor);
+        printk(KERN_DEBUG "%s: original COR %02x\n", __func__, old_cor);
 
         res = pcmcia_write_config_byte(hw_priv->link, CISREG_COR,
                                 old_cor | COR_SOFT_RESET);
         if (res != 0) {
-                printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 2 "
-                       "(%d)\n", res);
+                printk(KERN_DEBUG "%s failed 2 (%d)\n", __func__, res);
                 return;
         }
 
@@ -401,8 +398,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
         /* Setup Genesis mode */
         res = pcmcia_write_config_byte(hw_priv->link, CISREG_CCSR, hcr);
         if (res != 0) {
-                printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 3 "
-                       "(%d)\n", res);
+                printk(KERN_DEBUG "%s failed 3 (%d)\n", __func__, res);
                 return;
         }
         mdelay(10);
@@ -410,8 +406,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
         res = pcmcia_write_config_byte(hw_priv->link, CISREG_COR,
                                 old_cor & ~COR_SOFT_RESET);
         if (res != 0) {
-                printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 4 "
-                       "(%d)\n", res);
+                printk(KERN_DEBUG "%s failed 4 (%d)\n", __func__, res);
                 return;
         }