diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-11-04 18:43:23 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-11-04 18:43:23 +0100 |
| commit | d7e8d149c5f3774fd8d422364c38afb69501ccb0 (patch) | |
| tree | 572f292f6325c8dba90a39e62092d3b01247dc0b /drivers/clocksource/timer-mediatek.c | |
| parent | a99d8080aaf358d5d23581244e5da23b35e340b9 (diff) | |
| parent | 7693de9f7aa4e2993fbd7094863304be6a4bbe16 (diff) | |
| download | linux-d7e8d149c5f3774fd8d422364c38afb69501ccb0.tar.gz linux-d7e8d149c5f3774fd8d422364c38afb69501ccb0.tar.bz2 linux-d7e8d149c5f3774fd8d422364c38afb69501ccb0.zip | |
Merge tag 'timers-v5.4-rc6' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent
Pull clockevent fixes from Daniel Lezcano:
- Fix scary messages in sh_mtu2 by using platform_irq_count() helper
function (Geert Uytterhoeven)
- Fix double free when using timer-of in the mediatek timer driver
(Fabien Parent)
Diffstat (limited to 'drivers/clocksource/timer-mediatek.c')
| -rw-r--r-- | drivers/clocksource/timer-mediatek.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/clocksource/timer-mediatek.c b/drivers/clocksource/timer-mediatek.c index a562f491b0f8..9318edcd8963 100644 --- a/drivers/clocksource/timer-mediatek.c +++ b/drivers/clocksource/timer-mediatek.c @@ -268,15 +268,12 @@ static int __init mtk_syst_init(struct device_node *node) ret = timer_of_init(node, &to); if (ret) - goto err; + return ret; clockevents_config_and_register(&to.clkevt, timer_of_rate(&to), TIMER_SYNC_TICKS, 0xffffffff); return 0; -err: - timer_of_cleanup(&to); - return ret; } static int __init mtk_gpt_init(struct device_node *node) @@ -293,7 +290,7 @@ static int __init mtk_gpt_init(struct device_node *node) ret = timer_of_init(node, &to); if (ret) - goto err; + return ret; /* Configure clock source */ mtk_gpt_setup(&to, TIMER_CLK_SRC, GPT_CTRL_OP_FREERUN); @@ -311,9 +308,6 @@ static int __init mtk_gpt_init(struct device_node *node) mtk_gpt_enable_irq(&to, TIMER_CLK_EVT); return 0; -err: - timer_of_cleanup(&to); - return ret; } TIMER_OF_DECLARE(mtk_mt6577, "mediatek,mt6577-timer", mtk_gpt_init); TIMER_OF_DECLARE(mtk_mt6765, "mediatek,mt6765-timer", mtk_syst_init); |