summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-11-22 15:33:44 +0100
committerVineet Gupta <vgupta@synopsys.com>2016-11-30 11:54:25 -0800
commita26b0d4962c7daf91d942a917c71c20e164b687a (patch)
treea20bdb7696eac194d005226eae15fd505258d522 /drivers/clocksource
parent60263dcd821b9558ea08b112d9d31ffbe3ac643f (diff)
downloadlinux-a26b0d4962c7daf91d942a917c71c20e164b687a.tar.bz2
clocksource: nps: avoid maybe-uninitialized warning
We get a harmless false-positive warning with the newly added nps clocksource driver: drivers/clocksource/timer-nps.c: In function 'nps_setup_clocksource': drivers/clocksource/timer-nps.c:102:6: error: 'nps_timer1_freq' may be used uninitialized in this function [-Werror=maybe-uninitialized] Gcc here fails to identify that IS_ERR() is only true if PTR_ERR() has a nonzero value. Using PTR_ERR_OR_ZERO() to convert the result first makes this obvious and shuts up the warning. Fixes: 0ee4d9922df5 ("clocksource: Add clockevent support to NPS400 driver") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/timer-nps.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clocksource/timer-nps.c b/drivers/clocksource/timer-nps.c
index b4c8a023a2d4..8da5e93b6810 100644
--- a/drivers/clocksource/timer-nps.c
+++ b/drivers/clocksource/timer-nps.c
@@ -53,9 +53,10 @@ static int __init nps_get_timer_clk(struct device_node *node,
int ret;
*clk = of_clk_get(node, 0);
- if (IS_ERR(*clk)) {
+ ret = PTR_ERR_OR_ZERO(*clk);
+ if (ret) {
pr_err("timer missing clk");
- return PTR_ERR(*clk);
+ return ret;
}
ret = clk_prepare_enable(*clk);