diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192de/fw.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192de/fw.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c index b59de75a3643..f548a8d0068d 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c | |||
@@ -253,7 +253,7 @@ int rtl92d_download_fw(struct ieee80211_hw *hw) | |||
253 | bool fw_downloaded = false, fwdl_in_process = false; | 253 | bool fw_downloaded = false, fwdl_in_process = false; |
254 | unsigned long flags; | 254 | unsigned long flags; |
255 | 255 | ||
256 | if (!rtlhal->pfirmware) | 256 | if (rtlpriv->max_fw_size == 0 || !rtlhal->pfirmware) |
257 | return 1; | 257 | return 1; |
258 | fwsize = rtlhal->fwsize; | 258 | fwsize = rtlhal->fwsize; |
259 | pfwheader = (u8 *) rtlhal->pfirmware; | 259 | pfwheader = (u8 *) rtlhal->pfirmware; |
@@ -532,14 +532,8 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw, | |||
532 | void rtl92d_fill_h2c_cmd(struct ieee80211_hw *hw, | 532 | void rtl92d_fill_h2c_cmd(struct ieee80211_hw *hw, |
533 | u8 element_id, u32 cmd_len, u8 *cmdbuffer) | 533 | u8 element_id, u32 cmd_len, u8 *cmdbuffer) |
534 | { | 534 | { |
535 | struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); | ||
536 | u32 tmp_cmdbuf[2]; | 535 | u32 tmp_cmdbuf[2]; |
537 | 536 | ||
538 | if (rtlhal->fw_ready == false) { | ||
539 | RT_ASSERT(false, | ||
540 | "return H2C cmd because of Fw download fail!!!\n"); | ||
541 | return; | ||
542 | } | ||
543 | memset(tmp_cmdbuf, 0, 8); | 537 | memset(tmp_cmdbuf, 0, 8); |
544 | memcpy(tmp_cmdbuf, cmdbuffer, cmd_len); | 538 | memcpy(tmp_cmdbuf, cmdbuffer, cmd_len); |
545 | _rtl92d_fill_h2c_command(hw, element_id, cmd_len, (u8 *)&tmp_cmdbuf); | 539 | _rtl92d_fill_h2c_command(hw, element_id, cmd_len, (u8 *)&tmp_cmdbuf); |