diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192de/phy.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c index c736b933488..f27acc75494 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c | |||
@@ -2928,7 +2928,7 @@ static bool _rtl92d_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable, | |||
2928 | struct swchnlcmd *pcmd; | 2928 | struct swchnlcmd *pcmd; |
2929 | 2929 | ||
2930 | if (cmdtable == NULL) { | 2930 | if (cmdtable == NULL) { |
2931 | RT_ASSERT(false, ("cmdtable cannot be NULL.\n")); | 2931 | RT_ASSERT(false, "cmdtable cannot be NULL\n"); |
2932 | return false; | 2932 | return false; |
2933 | } | 2933 | } |
2934 | if (cmdtableidx >= cmdtablesz) | 2934 | if (cmdtableidx >= cmdtablesz) |
@@ -3120,19 +3120,18 @@ u8 rtl92d_phy_sw_chnl(struct ieee80211_hw *hw) | |||
3120 | * 5G and 2.4G band. */ | 3120 | * 5G and 2.4G band. */ |
3121 | if (channel <= 14) | 3121 | if (channel <= 14) |
3122 | return 0; | 3122 | return 0; |
3123 | RT_ASSERT((channel > 14), ("5G but channel<=14")); | 3123 | RT_ASSERT((channel > 14), "5G but channel<=14\n"); |
3124 | break; | 3124 | break; |
3125 | case BAND_ON_2_4G: | 3125 | case BAND_ON_2_4G: |
3126 | /* Get first channel error when change between | 3126 | /* Get first channel error when change between |
3127 | * 5G and 2.4G band. */ | 3127 | * 5G and 2.4G band. */ |
3128 | if (channel > 14) | 3128 | if (channel > 14) |
3129 | return 0; | 3129 | return 0; |
3130 | RT_ASSERT((channel <= 14), ("2G but channel>14")); | 3130 | RT_ASSERT((channel <= 14), "2G but channel>14\n"); |
3131 | break; | 3131 | break; |
3132 | default: | 3132 | default: |
3133 | RT_ASSERT(false, | 3133 | RT_ASSERT(false, "Invalid WirelessMode(%#x)!!\n", |
3134 | ("Invalid WirelessMode(%#x)!!\n", | 3134 | rtlpriv->mac80211.mode); |
3135 | rtlpriv->mac80211.mode)); | ||
3136 | break; | 3135 | break; |
3137 | } | 3136 | } |
3138 | rtlphy->sw_chnl_inprogress = true; | 3137 | rtlphy->sw_chnl_inprogress = true; |
@@ -3563,7 +3562,7 @@ void rtl92d_phy_set_poweron(struct ieee80211_hw *hw) | |||
3563 | } | 3562 | } |
3564 | } | 3563 | } |
3565 | if (i == 200) | 3564 | if (i == 200) |
3566 | RT_ASSERT(false, ("Another mac power off over time\n")); | 3565 | RT_ASSERT(false, "Another mac power off over time\n"); |
3567 | } | 3566 | } |
3568 | } | 3567 | } |
3569 | 3568 | ||