Unverified Commit 9176bda5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15370 wifi: brcmfmac: Check the return value of of_property_read_string_index() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Kai <liukai284@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/TKUTVXTFFFNGAJDO3AD5V33TVSUFSSJK/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBPC39 
 
Link:https://gitee.com/openeuler/kernel/pulls/15370

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 67070b51 52aeec7e

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

+4 −4
Original line number Diff line number Diff line
@@ -96,13 +96,13 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type, 
	/* Set board-type to the first string of the machine compatible prop */

	root = of_find_node_by_path("/");

	if (root && err) {

		char *board_type;

		char *board_type = NULL;

		const char *tmp;



		of_property_read_string_index(root, "compatible", 0, &tmp);



		/* get rid of '/' in the compatible string to be able to find the FW */

		if (!of_property_read_string_index(root, "compatible", 0, &tmp))

			board_type = devm_kstrdup(dev, tmp, GFP_KERNEL);



		if (!board_type) {

			of_node_put(root);

			return;