]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
net: stmmac: manage errors returned by of_get_mac_address()
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Sat, 27 Jul 2019 19:21:37 +0000 (21:21 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 29 Jul 2019 17:57:10 +0000 (10:57 -0700)
commit195b2919ccd7ffcaf6b6bbcb39444a53ab8308c7
tree1ad3861917d92255d2ff308d9431a791415f22b4
parent05bba1edaf9c11023901800bc4d2ce5b96e0836a
net: stmmac: manage errors returned by of_get_mac_address()

Commit d01f449c008a ("of_net: add NVMEM support to of_get_mac_address")
added support for reading the MAC address from an nvmem-cell. This
required changing the logic to return an error pointer upon failure.

If stmmac is loaded before the nvmem provider driver then
of_get_mac_address() return an error pointer with -EPROBE_DEFER.

Propagate this error so the stmmac driver will be probed again after the
nvmem provider driver is loaded.
Default to a random generated MAC address in case of any other error,
instead of using the error pointer as MAC address.

Fixes: d01f449c008a ("of_net: add NVMEM support to of_get_mac_address")
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c