1 From f4737a62033d7f3e0db740c449fc62119da7ab8a Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
3 Date: Mon, 30 Jan 2017 16:09:51 +0100
4 Subject: [PATCH] brcmfmac: check brcmf_bus_get_memdump result for error
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 This method may be unsupported (see: USB bus) or may just fail (see:
11 While at it rework logic in brcmf_sdio_bus_get_memdump function to avoid
12 too many conditional code nesting levels.
14 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
15 Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
16 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
18 .../wireless/broadcom/brcm80211/brcmfmac/debug.c | 23 +++++++++++++++-------
19 1 file changed, 16 insertions(+), 7 deletions(-)
21 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c
22 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c
23 @@ -32,16 +32,25 @@ static int brcmf_debug_create_memdump(st
29 ramsize = brcmf_bus_get_ramsize(bus);
31 - dump = vzalloc(len + ramsize);
34 - memcpy(dump, data, len);
35 - brcmf_bus_get_memdump(bus, dump + len, ramsize);
36 - dev_coredumpv(bus->dev, dump, len + ramsize, GFP_KERNEL);
40 + dump = vzalloc(len + ramsize);
44 + memcpy(dump, data, len);
45 + err = brcmf_bus_get_memdump(bus, dump + len, ramsize);
51 + dev_coredumpv(bus->dev, dump, len + ramsize, GFP_KERNEL);