diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-04-30 11:30:51 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-04-30 11:30:51 +0200 |
| commit | b1dd1585deb21db5b595549267219ff9364dd4c8 (patch) | |
| tree | 3d8243153a88836cca5bbfef04751dd27179cd27 /drivers/net/fec_imx.c | |
| parent | ea44dc8f3392ef94d8f958788571182f380c7b84 (diff) | |
| parent | d76f885ee3d9ace2d075cb0638e77d8358d422cf (diff) | |
| download | barebox-b1dd1585deb21db5b595549267219ff9364dd4c8.tar.gz barebox-b1dd1585deb21db5b595549267219ff9364dd4c8.tar.xz | |
Merge branch 'for-next/mxs' into next
Diffstat (limited to 'drivers/net/fec_imx.c')
| -rw-r--r-- | drivers/net/fec_imx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index f814b3b960..772f930f0d 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -705,10 +705,10 @@ static int fec_clk_get(struct fec_priv *fec) { int i, err = 0; static const char *clk_names[ARRAY_SIZE(fec->clk)] = { - "ipg", "ahb", "ptp" + "ipg", "ahb", }; static const char *opt_clk_names[ARRAY_SIZE(fec->opt_clk)] = { - "enet_clk_ref", "enet_out", + "enet_clk_ref", "enet_out", "ptp" }; for (i = 0; i < ARRAY_SIZE(fec->clk); i++) { @@ -716,7 +716,7 @@ static int fec_clk_get(struct fec_priv *fec) if (IS_ERR(fec->clk[i])) { err = PTR_ERR(fec->clk[i]); fec_clk_put(fec); - break; + return err; } } |