]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
rtlwifi: Fix fallback firmware loading
authorSven Joachim <svenjoac@gmx.de>
Mon, 31 Jul 2017 16:10:45 +0000 (18:10 +0200)
committerSeth Forshee <seth.forshee@canonical.com>
Sun, 10 Sep 2017 23:09:00 +0000 (18:09 -0500)
commitefd90d218c5d681369c4751b575f7649463cd33f
tree54019f9240a5dbdd543441b28a94b43dd803209b
parent229dd78a53368d476bf431ff596daa3048018611
rtlwifi: Fix fallback firmware loading

BugLink: http://bugs.launchpad.net/bugs/1716284
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>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c