]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: rtlwifi: do not complete firmware loading needlessly
authorThadeu Lima de Souza Cascardo <cascardo@igalia.com>
Thu, 7 Nov 2024 13:33:18 +0000 (10:33 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Mar 2025 11:49:53 +0000 (12:49 +0100)
[ Upstream commit e73e11d303940119e41850a0452a0deda2cc4eb5 ]

The only code waiting for completion is driver removal, which will not be
called when probe returns a failure. So this completion is unnecessary.

Fixes: b0302aba812b ("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-2-cascardo@igalia.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/realtek/rtlwifi/pci.c
drivers/net/wireless/realtek/rtlwifi/usb.c

index 6d9f2a6233a2102e602c8db799f34ef8157f009f..70f1cc906502b2173c2565b150ef3c58ecc51753 100644 (file)
@@ -2274,7 +2274,6 @@ fail2:
                pci_iounmap(pdev, (void __iomem *)rtlpriv->io.pci_mem_start);
 
        pci_release_regions(pdev);
-       complete(&rtlpriv->firmware_loading_complete);
 
 fail1:
        if (hw)
index a8eebafb9a7ee2b5a7b813c537c9a3a3384ec2b5..c2a3c88ea1fcc0dc0fcf25ae2b37640278ac2a8a 100644 (file)
@@ -1085,7 +1085,6 @@ error_out:
 error_out2:
        _rtl_usb_io_handler_release(hw);
        usb_put_dev(udev);
-       complete(&rtlpriv->firmware_loading_complete);
        kfree(rtlpriv->usb_data);
        ieee80211_free_hw(hw);
        return -ENODEV;