| From e9c716b17b6d77080343cd58440d882ec0b880c2 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 16 Feb 2020 16:39:43 -0300 |
| Subject: net: ethernet: dm9000: Handle -EPROBE_DEFER in dm9000_parse_dt() |
| |
| From: Paul Cercueil <paul@crapouillou.net> |
| |
| [ Upstream commit 9a6a0dea16177ccaecc116f560232e63bec115f1 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/davicom/dm9000.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c |
| index cce90b5925d93..70060c51854fd 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; |
| } |
| -- |
| 2.20.1 |
| |
