From: Paul Cercueil <paul@crapouillou.net>
Date: Sun, 16 Feb 2020 19:39:43 +0000 (-0300)
Subject: net: ethernet: dm9000: Handle -EPROBE_DEFER in dm9000_parse_dt()
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=9a6a0dea16177ccaecc116f560232e63bec115f1;p=kernel.git

net: ethernet: dm9000: Handle -EPROBE_DEFER in dm9000_parse_dt()

The call to of_get_mac_address() can return -EPROBE_DEFER, for instance
when the MAC address is read from a NVMEM driver that did not probe yet.

Cc: H. Nikolaus Schaller <hns@goldelico.com>
Cc: Mathieu Malaterre <malat@debian.org>
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
index 1ea3372775e6d..e94ae9b94dbfc 100644
--- a/drivers/net/ethernet/davicom/dm9000.c
+++ b/drivers/net/ethernet/davicom/dm9000.c
@@ -1405,6 +1405,8 @@ static struct dm9000_plat_data *dm9000_parse_dt(struct device *dev)
 	mac_addr = of_get_mac_address(np);
 	if (!IS_ERR(mac_addr))
 		ether_addr_copy(pdata->dev_addr, mac_addr);
+	else if (PTR_ERR(mac_addr) == -EPROBE_DEFER)
+		return ERR_CAST(mac_addr);
 
 	return pdata;
 }