diff options
| author |   Yongbae Park <yongbae2@gmail.com> | 2015-03-03 19:46:49 +0900 |
|---|---|---|
| committer |   Daniel Lezcano <daniel.lezcano@linaro.org> | 2015-03-05 15:01:36 +0100 |
| commit | 7b8f10da3bf1056546133c9f54f49ce389fd95ab (patch) | |
| tree | 5909a392ea9dcd05abde742b6f61efbdd26f9d36 /drivers/clocksource | |
| parent | Linux 4.0-rc2 (diff) | |
| download | linux-dev-7b8f10da3bf1056546133c9f54f49ce389fd95ab.tar.xz linux-dev-7b8f10da3bf1056546133c9f54f49ce389fd95ab.zip | |
clocksource: efm32: Fix a NULL pointer dereference
The initialisation of the efm32 clocksource first sets up the irq and only
after that initialises the data needed for irq handling. In case this
initialisation is delayed the irq handler would dereference a NULL pointer.
I'm not aware of anything that could delay the process in such a way, but it's
better to be safe than sorry, so setup the irq only when the clock event device
is ready.
Cc: stable@vger.kernel.org
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Yongbae Park <yongbae2@gmail.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/time-efm32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/time-efm32.c b/drivers/clocksource/time-efm32.c index bba62f9deefb..ec57ba2bbd87 100644 --- a/drivers/clocksource/time-efm32.c +++ b/drivers/clocksource/time-efm32.c @@ -225,12 +225,12 @@ static int __init efm32_clockevent_init(struct device_node *np) clock_event_ddata.base = base; clock_event_ddata.periodic_top = DIV_ROUND_CLOSEST(rate, 1024 * HZ); - setup_irq(irq, &efm32_clock_event_irq); - clockevents_config_and_register(&clock_event_ddata.evtdev, DIV_ROUND_CLOSEST(rate, 1024), 0xf, 0xffff); + setup_irq(irq, &efm32_clock_event_irq); + return 0; err_get_irq: |