diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2018-06-19 17:19:28 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2018-06-19 17:19:28 +0200 |
commit | 731e809d3e4a14e49756bd4158b98c69e39a8459 (patch) | |
tree | 66644c715500c88a6f6285cae57a6067f0ed8105 /drivers/net/phy/mdio-sun4i.c | |
parent | b2a7f2f2fd3ec48b3d309111b6fe8ddee227539d (diff) | |
parent | 5b5a04065fb5487303869fd6080c30f86530005d (diff) |
Merge branch 'fslc_4.9-1.0.x-imx' into toradex_4.9-1.0.x-imx-next
Diffstat (limited to 'drivers/net/phy/mdio-sun4i.c')
-rw-r--r-- | drivers/net/phy/mdio-sun4i.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/phy/mdio-sun4i.c b/drivers/net/phy/mdio-sun4i.c index 135296508a7e..6425ce04d3f9 100644 --- a/drivers/net/phy/mdio-sun4i.c +++ b/drivers/net/phy/mdio-sun4i.c @@ -118,8 +118,10 @@ static int sun4i_mdio_probe(struct platform_device *pdev) data->regulator = devm_regulator_get(&pdev->dev, "phy"); if (IS_ERR(data->regulator)) { - if (PTR_ERR(data->regulator) == -EPROBE_DEFER) - return -EPROBE_DEFER; + if (PTR_ERR(data->regulator) == -EPROBE_DEFER) { + ret = -EPROBE_DEFER; + goto err_out_free_mdiobus; + } dev_info(&pdev->dev, "no regulator found\n"); data->regulator = NULL; |