diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-31 08:30:17 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-31 08:30:17 +0300 |
| commit | 169310f71fc820fe153ec04c6a111e444a68d6d5 (patch) | |
| tree | a586d0f08548159ceb8527ff59f8414579f70c1f /drivers/net/ethernet/arc/emac_rockchip.c | |
| parent | b3c39758c8a6972f02b43f83dba7fe7a352371b9 (diff) | |
| parent | c2a9838452a4d71f76103c18c926468a9ea05713 (diff) | |
| download | linux-169310f71fc820fe153ec04c6a111e444a68d6d5.tar.xz | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/arc/emac_rockchip.c')
| -rw-r--r-- | drivers/net/ethernet/arc/emac_rockchip.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/arc/emac_rockchip.c b/drivers/net/ethernet/arc/emac_rockchip.c index 16f9bee992fe..0f6576802607 100644 --- a/drivers/net/ethernet/arc/emac_rockchip.c +++ b/drivers/net/ethernet/arc/emac_rockchip.c @@ -169,8 +169,10 @@ static int emac_rockchip_probe(struct platform_device *pdev) /* Optional regulator for PHY */ priv->regulator = devm_regulator_get_optional(dev, "phy"); if (IS_ERR(priv->regulator)) { - if (PTR_ERR(priv->regulator) == -EPROBE_DEFER) - return -EPROBE_DEFER; + if (PTR_ERR(priv->regulator) == -EPROBE_DEFER) { + err = -EPROBE_DEFER; + goto out_clk_disable; + } dev_err(dev, "no regulator found\n"); priv->regulator = NULL; } |