Unverified Commit 89ae4439 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15273 ARM: davinci: da850-evm: Avoid NULL pointer dereference 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yuntao Liu <liuyuntao12@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/7X34L2J2MN24AEDRJSEML2QPQLHFBQSN/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBP62H 
 
Link:https://gitee.com/openeuler/kernel/pulls/15273

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 7d8bd75f 4f3f0c19

arch/arm/mach-davinci/board-da850-evm.c

+3 −1
Original line number Diff line number Diff line
@@ -1045,11 +1045,13 @@ static int __init da850_evm_config_emac(void) 
	int ret;

	u32 val;

	struct davinci_soc_info *soc_info = &davinci_soc_info;

	u8 rmii_en = soc_info->emac_pdata->rmii_en;

	u8 rmii_en;



	if (!machine_is_davinci_da850_evm())

		return 0;



	rmii_en = soc_info->emac_pdata->rmii_en;



	cfg_chip3_base = DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP3_REG);



	val = __raw_readl(cfg_chip3_base);