The local variable chipname is string representation of chip id and revision
which is printed in the good flow of brcmf_fw_alloc_request(). Also use it
for the error path, ie. for unknown/unsupported devices.

Reviewed-by: Hante Meuleman <[email protected]>
Reviewed-by: Pieter-Paul Giesberts <[email protected]>
Reviewed-by: Franky Lin <[email protected]>
Signed-off-by: Arend van Spriel <[email protected]>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c 
b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
index cf1ddf9..8209a42 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
@@ -719,8 +719,10 @@ struct brcmf_fw_request *
                        break;
        }
 
+       brcmf_chip_name(chip, chiprev, chipname, sizeof(chipname));
+
        if (i == table_size) {
-               brcmf_err("Unknown chipid %d [%d]\n", chip, chiprev);
+               brcmf_err("Unknown chip %s\n", chipname);
                return NULL;
        }
 
@@ -729,8 +731,6 @@ struct brcmf_fw_request *
        if (!fwreq)
                return NULL;
 
-       brcmf_chip_name(chip, chiprev, chipname, sizeof(chipname));
-
        brcmf_info("using %s for chip %s\n",
                   mapping_table[i].fw_base, chipname);
 
-- 
1.9.1

Reply via email to