summaryrefslogtreecommitdiff
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorChuhong Yuan <hslester96@gmail.com>2019-10-16 20:43:30 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-04 13:40:45 +0100
commitf56519e9abe7a219055a1ee1d0523b57746311a2 (patch)
treecb58169995f06c92e9b4ff33f5dd01d15b58950c /drivers/clocksource
parentbbed8ffa4164ec9a85de6e45e0b9ce553c7d098c (diff)
clocksource/drivers/asm9260: Add a check for of_clk_get
[ Upstream commit 6e001f6a4cc73cd06fc7b8c633bc4906c33dd8ad ] asm9260_timer_init misses a check for of_clk_get. Add a check for it and print errors like other clocksource drivers. Signed-off-by: Chuhong Yuan <hslester96@gmail.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Link: https://lore.kernel.org/r/20191016124330.22211-1-hslester96@gmail.com Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/asm9260_timer.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/clocksource/asm9260_timer.c b/drivers/clocksource/asm9260_timer.c
index 1ba871b7fe11..e5717807c00a 100644
--- a/drivers/clocksource/asm9260_timer.c
+++ b/drivers/clocksource/asm9260_timer.c
@@ -198,6 +198,10 @@ static int __init asm9260_timer_init(struct device_node *np)
}
clk = of_clk_get(np, 0);
+ if (IS_ERR(clk)) {
+ pr_err("Failed to get clk!\n");
+ return PTR_ERR(clk);
+ }
ret = clk_prepare_enable(clk);
if (ret) {