Some boards have no MAC PROM on the IOC3's 1-wire bus, and the probe defers forever there. Let the platform supply the address as a device property for such a board. Signed-off-by: Imre Kaloz --- drivers/net/ethernet/sgi/ioc3-eth.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c index 25139cf5ff62..fa844267c325 100644 --- a/drivers/net/ethernet/sgi/ioc3-eth.c +++ b/drivers/net/ethernet/sgi/ioc3-eth.c @@ -857,8 +857,9 @@ static int ioc3eth_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Invalid resource\n"); return -EINVAL; } - /* get mac addr from one wire prom */ - if (ioc3eth_get_mac_addr(regs, mac_addr)) + /* get mac addr from one wire prom, or from a device property */ + if (ioc3eth_get_mac_addr(regs, mac_addr) && + device_get_mac_address(&pdev->dev, mac_addr)) return -EPROBE_DEFER; /* not available yet */ dev = alloc_etherdev(sizeof(struct ioc3_private)); -- 2.47.3