git.openwrt.org Git - openwrt/staging/zorun.git/blob

   1 From 1170f6d1be6a39e1a115a2c0f50923eb4ce2a7ec Mon Sep 17 00:00:00 2001
   2 From: Arend Van Spriel <arend.vanspriel@broadcom.com>
   3 Date: Thu, 22 Mar 2018 21:28:20 +0100
   4 Subject: [PATCH] brcmfmac: do not convert linux error to firmware error string
   5
   6 In case of a linux error brcmf_fil_cmd_data() blurts an error message
   7 in which the error code is translated to an error string. However, it
   8 maps it to a firmware error string which should not happen. Simply
   9 print only the numeric error code and be done with it.
  10
  11 Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
  12 Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
  13 Reviewed-by: Franky Lin <franky.lin@broadcom.com>
  14 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  15 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  16 ---
  17  drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c | 3 +--
  18  1 file changed, 1 insertion(+), 2 deletions(-)
  19
  20 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
  21 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
  22 @@ -124,8 +124,7 @@ brcmf_fil_cmd_data(struct brcmf_if *ifp,
  23                                              data, len, &fwerr);
  24
  25         if (err) {
  26 -               brcmf_dbg(FIL, "Failed: %s (%d)\n",
  27 -                         brcmf_fil_get_errstr((u32)(-err)), err);
  28 +               brcmf_dbg(FIL, "Failed: error=%d\n", err);
  29         } else if (fwerr < 0) {
  30                 brcmf_dbg(FIL, "Firmware error: %s (%d)\n",
  31                           brcmf_fil_get_errstr((u32)(-fwerr)), fwerr);