lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 411/700] brcmfmac: Delete second brcm folder hierarchy
    Date
    From: Matthias Brugger <mbrugger@suse.com>

    [ Upstream commit 4a26aafe4886a4ec9965171c280ce16df30dc362 ]

    BRCMF_FW_DEFAULT_PATH already defines the brcm folder, delete the second
    folder to match with Linux firmware repository layout.

    Fixes: 75729e110e68 ("brcmfmac: expose firmware config files through modinfo")
    Signed-off-by: Matthias Brugger <mbrugger@suse.com>
    Reviewed-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Link: https://lore.kernel.org/r/20210602144305.4481-1-matthias.bgg@kernel.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
    index 3a1c98a046f0..faf5f8e5eee3 100644
    --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
    +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
    @@ -626,8 +626,8 @@ BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");
    BRCMF_FW_DEF(43012, "brcmfmac43012-sdio");

    /* firmware config files */
    -MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac*-sdio.*.txt");
    -MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac*-pcie.*.txt");
    +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.txt");
    +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.*.txt");

    static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
    BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:10    [W:3.806 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site