72f6025d69
It backports brcmfmac commits from kernel 4.17.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 3c8bb92655)
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
From 1170f6d1be6a39e1a115a2c0f50923eb4ce2a7ec Mon Sep 17 00:00:00 2001
|
|
From: Arend Van Spriel <arend.vanspriel@broadcom.com>
|
|
Date: Thu, 22 Mar 2018 21:28:20 +0100
|
|
Subject: [PATCH] brcmfmac: do not convert linux error to firmware error string
|
|
|
|
In case of a linux error brcmf_fil_cmd_data() blurts an error message
|
|
in which the error code is translated to an error string. However, it
|
|
maps it to a firmware error string which should not happen. Simply
|
|
print only the numeric error code and be done with it.
|
|
|
|
Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
|
|
Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
|
|
Reviewed-by: Franky Lin <franky.lin@broadcom.com>
|
|
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
|
|
@@ -124,8 +124,7 @@ brcmf_fil_cmd_data(struct brcmf_if *ifp,
|
|
data, len, &fwerr);
|
|
|
|
if (err) {
|
|
- brcmf_dbg(FIL, "Failed: %s (%d)\n",
|
|
- brcmf_fil_get_errstr((u32)(-err)), err);
|
|
+ brcmf_dbg(FIL, "Failed: error=%d\n", err);
|
|
} else if (fwerr < 0) {
|
|
brcmf_dbg(FIL, "Firmware error: %s (%d)\n",
|
|
brcmf_fil_get_errstr((u32)(-fwerr)), fwerr);
|