diff options
| author |   Christophe Jaillet <christophe.jaillet@wanadoo.fr> | 2017-06-23 21:55:10 +0200 |
|---|---|---|
| committer |   Daniel Lezcano <daniel.lezcano@linaro.org> | 2017-06-27 11:25:40 +0200 |
| commit | 8c3ecd60e2ee6268e1735952e5b544f05b4dbb5a (patch) | |
| tree | eb5ce868accdb73fe1e768c1ccadb90e9895ab18 /drivers/clocksource | |
| parent | clocksource/drivers/fsl_ftm_timer: Unmap region obtained by of_iomap (diff) | |
| download | linux-dev-8c3ecd60e2ee6268e1735952e5b544f05b4dbb5a.tar.xz linux-dev-8c3ecd60e2ee6268e1735952e5b544f05b4dbb5a.zip | |
clocksource/drivers/mips-gic-timer: Fix an error code in 'gic_clocksource_of_init()'
'clk' is a valid pointer at this point. So calling PTR_ERR on it is
pointess.
Return the error code from 'clk_prepare_enable()' if it fails instead.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/mips-gic-timer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c index e31e08326024..17b861ea2626 100644 --- a/drivers/clocksource/mips-gic-timer.c +++ b/drivers/clocksource/mips-gic-timer.c @@ -167,10 +167,11 @@ static int __init gic_clocksource_of_init(struct device_node *node) clk = of_clk_get(node, 0); if (!IS_ERR(clk)) { - if (clk_prepare_enable(clk) < 0) { + ret = clk_prepare_enable(clk); + if (ret < 0) { pr_err("GIC failed to enable clock\n"); clk_put(clk); - return PTR_ERR(clk); + return ret; } gic_frequency = clk_get_rate(clk); |