]> git.hungrycats.org Git - linux/commit
rtlwifi: Fix fallback firmware loading
authorSven Joachim <svenjoac@gmx.de>
Mon, 31 Jul 2017 16:10:45 +0000 (18:10 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 9 Sep 2017 15:39:35 +0000 (17:39 +0200)
commitce4ef9346d9f93e1c328fe575944def708230bb3
tree38430f58618cb94aaf8155a6ea9d31cefe57170b
parent21da5e36f41e951a8d01b0e0af97ddac4e5304d9
rtlwifi: Fix fallback firmware loading

commit 1d9b168d8ea9a0f51947d0e2f84856e77d2fe7ff upstream.

Commit f70e4df2b384 ("rtlwifi: Add code to read new versions of
firmware") added code to load an old firmware file if the new one is
not available.  Unfortunately that code is never reached because
request_firmware_nowait() does not wait for the firmware to show up
and returns 0 even if the file is not there.

Use the existing fallback mechanism introduced by commit 62009b7f1279
("rtlwifi: rtl8192cu: Add new firmware") instead.

Fixes: f70e4df2b384 ("rtlwifi: Add code to read new versions of firmware")
Signed-off-by: Sven Joachim <svenjoac@gmx.de>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c