* [PATCH] stmmac: devm_reset_control_get can return PROBE_DEFER
@ 2015-04-09 1:41 Phil Reid
2015-04-09 18:11 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Phil Reid @ 2015-04-09 1:41 UTC (permalink / raw)
To: peppe.cavallaro; +Cc: netdev, Phil Reid
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>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
index e97074c..1cacea9 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);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] stmmac: devm_reset_control_get can return PROBE_DEFER
2015-04-09 1:41 [PATCH] stmmac: devm_reset_control_get can return PROBE_DEFER Phil Reid
@ 2015-04-09 18:11 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-04-09 18:11 UTC (permalink / raw)
To: preid; +Cc: peppe.cavallaro, netdev
From: Phil Reid <preid@electromag.com.au>
Date: Wed, 8 Apr 2015 18:41:34 -0700
> 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>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-04-09 18:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-09 1:41 [PATCH] stmmac: devm_reset_control_get can return PROBE_DEFER Phil Reid
2015-04-09 18:11 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).