]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
net: ethernet: dm9000: Handle -EPROBE_DEFER in dm9000_parse_dt()
authorPaul Cercueil <paul@crapouillou.net>
Sun, 16 Feb 2020 19:39:43 +0000 (16:39 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Mar 2020 06:18:26 +0000 (07:18 +0100)
[ 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

index cce90b5925d93fe70fe5f04060c46e225384c776..70060c51854fd366f7cfbcd5ee4186664f80dcad 100644 (file)
@@ -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;
 }