rtlwifi: rtl8192se: Fix gcc 4.7.x warning

[pandora-kernel.git] / drivers / net / wireless / rtlwifi / rtl8192se / phy.c

diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
index 81a5aa4..c336026 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
@@ -27,6 +27,8 @@
  *
  *****************************************************************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "../wifi.h"
 #include "../pci.h"
 #include "../ps.h"
@@ -600,7 +602,7 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
                }
        case ERFSLEEP:
                        if (ppsc->rfpwr_state == ERFOFF)
-                               break;
+                               return false;
 
                        for (queue_id = 0, i = 0;
                             queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
@@ -1016,8 +1018,7 @@ static bool _rtl92s_phy_bb_config_parafile(struct ieee80211_hw *hw)
        rtstatus = _rtl92s_phy_config_bb(hw, BASEBAND_CONFIG_AGC_TAB);
 
        if (rtstatus != true) {
-               printk(KERN_ERR  "_rtl92s_phy_bb_config_parafile(): "
-                      "AGC Table Fail\n");
+               pr_err("%s(): AGC Table Fail\n", __func__);
                goto phy_BB8190_Config_ParaFile_Fail;
        }
 
@@ -1253,6 +1254,9 @@ static void _rtl92s_phy_get_txpower_index(struct ieee80211_hw *hw, u8 channel,
                /* Read HT 40 OFDM TX power */
                ofdmpowerLevel[0] = rtlefuse->txpwrlevel_ht40_2s[0][index];
                ofdmpowerLevel[1] = rtlefuse->txpwrlevel_ht40_2s[1][index];
+       } else {
+               ofdmpowerLevel[0] = 0;
+               ofdmpowerLevel[1] = 0;
        }
 }