Commit 73c65541 authored by Zheng Yongjun's avatar Zheng Yongjun Committed by Kalle Valo
Browse files

brcmfmac: Delete useless kfree code 



A null pointer will be passed to a kfree() call after a kzalloc() call failed.
This code is useless. Thus delete the extra function call.

A goto statement is also no longer needed. Thus adjust an if branch.

Signed-off-by: default avatarZheng Yongjun <zhengyongjun3@huawei.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201222135113.20680-1-zhengyongjun3@huawei.com
parent 0924ba9f

drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c

+4 −6
Original line number Diff line number Diff line
@@ -319,8 +319,10 @@ static void brcmf_fw_strip_multi_v2(struct nvram_parser *nvp, u16 domain_nr, 
	u8 *nvram;



	nvram = kzalloc(nvp->nvram_len + 1 + 3 + sizeof(u32), GFP_KERNEL);

	if (!nvram)

		goto fail;

	if (!nvram) {

		nvp->nvram_len = 0;

		return;

	}



	/* Copy all valid entries, release old nvram and assign new one.

	 * Valid entries are of type pcie/X/Y/ where X = domain_nr and
@@ -350,10 +352,6 @@ static void brcmf_fw_strip_multi_v2(struct nvram_parser *nvp, u16 domain_nr, 
	kfree(nvp->nvram);

	nvp->nvram = nvram;

	nvp->nvram_len = j;

	return;

fail:

	kfree(nvram);

	nvp->nvram_len = 0;

}



static void brcmf_fw_add_defaults(struct nvram_parser *nvp)