From: Phil Reid Date: Thu, 9 Apr 2015 01:41:34 +0000 (-0700) Subject: stmmac: devm_reset_control_get can return PROBE_DEFER X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~12513^2~2^2~4 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=27015f8c17578e14b3c6cc098b915b0f8db3ac36;p=mirror_ubuntu-focal-kernel.git stmmac: devm_reset_control_get can return PROBE_DEFER In socfpga_dwmac_parse_data forward error code from devm_reset_control_get. This gives the driver another chance to laod if altr,rst-mgr is loaded after the network driver. Signed-off-by: Phil Reid Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c index e97074cd5800..1cacea9765b4 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c @@ -91,7 +91,7 @@ static int socfpga_dwmac_parse_data(struct socfpga_dwmac *dwmac, struct device * STMMAC_RESOURCE_NAME); if (IS_ERR(dwmac->stmmac_rst)) { dev_info(dev, "Could not get reset control!\n"); - return -EINVAL; + return PTR_ERR(dwmac->stmmac_rst); } dwmac->interface = of_get_phy_mode(np);