From 0e42f5ca50147458e9cfb5766aa2790278b50fed Mon Sep 17 00:00:00 2001 From: Sunil Paidimarri Date: Fri, 18 Sep 2020 13:18:33 -0700 Subject: [PATCH] net: stmmac: set valid mac addr in success case Set valid mac address to true only if mac address programmed in fuse register valid. Change-Id: I464b81a8b8728f36f93bed732e9c58495db4a4de Signed-off-by: Sunil Paidimarri --- drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index 0ba9169ba60d..a6865d64b8b0 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -2707,7 +2707,6 @@ static void read_mac_addr_from_fuse_reg(struct device_node *np) u32 mac_efuse_prop, efuse_size = 8; void __iomem *mac_efuse_addr; unsigned long mac_addr; - bool valid_mac = false; ret = of_property_read_u32(np, "mac-efuse-addr", &mac_efuse_prop); if (!ret) { @@ -2725,14 +2724,13 @@ static void read_mac_addr_from_fuse_reg(struct device_node *np) mac_addr = mac_addr >> 8; } - valid_mac = is_valid_ether_addr(pparams.mac_addr); - if (!valid_mac) { + pparams.is_valid_mac_addr = + is_valid_ether_addr(pparams.mac_addr); + if (!pparams.is_valid_mac_addr) { ETHQOSERR("Invalid Mac address set: %llx\n", mac_addr); return; } } - - pparams.is_valid_mac_addr = true; } static int qcom_ethqos_probe(struct platform_device *pdev)