summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-10-17 08:10:19 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-10-17 08:10:19 +0200
commitb4e30bb8b73c9702d3283e1b514d672978b6951d (patch)
treeeed477fdd1b707261022bb8785ef2a3d707ce118 /drivers/net
parent97f279282bddf9017837c44830d6079637768607 (diff)
parent94e2382281ba950d63df78ead7fc5ca9aad72cda (diff)
downloadbarebox-b4e30bb8b73c9702d3283e1b514d672978b6951d.tar.gz
Merge branch 'for-next/imx'
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/fec_imx.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index 31c9102..5ef1d43 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -781,7 +781,8 @@ static int fec_probe(struct device_d *dev)
if (IS_ERR(fec->reg_phy)) {
if (PTR_ERR(fec->reg_phy) == -EPROBE_DEFER) {
ret = -EPROBE_DEFER;
- goto disable_clk;
+ fec->reg_phy = NULL;
+ goto release_res;
}
fec->reg_phy = NULL;
}
@@ -789,7 +790,7 @@ static int fec_probe(struct device_d *dev)
ret = regulator_enable(fec->reg_phy);
if (ret) {
dev_err(dev, "Failed to enable phy regulator: %d\n", ret);
- goto disable_clk;
+ goto release_res;
}
phy_reset = of_get_named_gpio(dev->device_node, "phy-reset-gpios", 0);