summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@linaro.org>2016-09-08 14:25:40 +0200
committerDaniel Lezcano <daniel.lezcano@linaro.org>2016-09-12 07:28:38 +0200
commite2a2d38501cb759333342d97442b3742830752ca (patch)
tree4af05d709079885bb80f8212a0031f7ab3174f6a /drivers/clocksource
parentcf1e929c8a389bc0be63f86100f962217ea99455 (diff)
downloadlinux-stable-e2a2d38501cb759333342d97442b3742830752ca.tar.gz
linux-stable-e2a2d38501cb759333342d97442b3742830752ca.tar.bz2
linux-stable-e2a2d38501cb759333342d97442b3742830752ca.zip
clocksource/drivers/moxart: Replace panic by pr_err
The clksrc-of code is supposed to catch the return code and fail gracefully. Don't panic on error, but print the error and exit with a relevant error code. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/moxart_timer.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/clocksource/moxart_timer.c b/drivers/clocksource/moxart_timer.c
index cba25b75c29b..2a8f4705c734 100644
--- a/drivers/clocksource/moxart_timer.c
+++ b/drivers/clocksource/moxart_timer.c
@@ -184,8 +184,10 @@ static int __init moxart_timer_init(struct device_node *node)
} else if (of_device_is_compatible(node, "aspeed,ast2400-timer")) {
timer->t1_enable_val = ASPEED_TIMER1_ENABLE;
timer->t1_disable_val = ASPEED_TIMER1_DISABLE;
- } else
- panic("%s: unknown platform\n", node->full_name);
+ } else {
+ pr_err("%s: unknown platform\n", node->full_name);
+ return -EINVAL;
+ }
timer->count_per_tick = DIV_ROUND_CLOSEST(pclk, HZ);