shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

wifi: rtlwifi: rtl8192se: rise completion of firmware loading as last step

Browse Source 
[ Upstream commit 8559a9e0c457729fe3edb3176bbf7c7874f482b0 ]

Just like in commit 4dfde294b9 ("rtlwifi: rise completion at the last
step of firmware callback"), only signal completion once the function is
finished. Otherwise, the module removal waiting for the completion could
free the memory that the callback will still use before returning.

Fixes: b0302aba81 ("rtlwifi: Convert to asynchronous firmware load")
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20241107133322.855112-3-cascardo@igalia.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Thadeu Lima de Souza Cascardo
2024-11-07 10:33:19 -03:00
committed by Greg Kroah-Hartman
parent 2e1f359a34
commit ebe37758e2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
View File

@@ -67,22 +67,23 @@ static void rtl92se_fw_cb(const struct firmware *firmware, void *context)
rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD, rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,
"Firmware callback routine entered!\n"); "Firmware callback routine entered!\n");
complete(&rtlpriv->firmware_loading_complete);
if (!firmware) { if (!firmware) {
pr_err("Firmware %s not available\n", fw_name); pr_err("Firmware %s not available\n", fw_name);
rtlpriv->max_fw_size = 0; rtlpriv->max_fw_size = 0;
return; goto exit;
} }
if (firmware->size > rtlpriv->max_fw_size) { if (firmware->size > rtlpriv->max_fw_size) {
pr_err("Firmware is too big!\n"); pr_err("Firmware is too big!\n");
rtlpriv->max_fw_size = 0; rtlpriv->max_fw_size = 0;
release_firmware(firmware); release_firmware(firmware);
return; goto exit;
} }
pfirmware = (struct rt_firmware *)rtlpriv->rtlhal.pfirmware; pfirmware = (struct rt_firmware *)rtlpriv->rtlhal.pfirmware;
memcpy(pfirmware->sz_fw_tmpbuffer, firmware->data, firmware->size); memcpy(pfirmware->sz_fw_tmpbuffer, firmware->data, firmware->size);
pfirmware->sz_fw_tmpbufferlen = firmware->size; pfirmware->sz_fw_tmpbufferlen = firmware->size;
release_firmware(firmware); release_firmware(firmware);
exit:
complete(&rtlpriv->firmware_loading_complete);
} }
static int rtl92s_init_sw_vars(struct ieee80211_hw *hw) static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)