diff options
| author | Phil Reid <preid@electromag.com.au> | 2015-04-08 18:41:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-09 14:11:19 -0400 |
| commit | 27015f8c17578e14b3c6cc098b915b0f8db3ac36 (patch) | |
| tree | 1bb45a51c7cfc49535e3f77de231a71e52631c35 /drivers/net | |
| parent | 69304cc986bdcd7a09df179aeda3736f7e1544a5 (diff) | |
| download | linux-27015f8c17578e14b3c6cc098b915b0f8db3ac36.tar.bz2 | |
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 <preid@electromag.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |