Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 07:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clocksource: nps: avoid maybe-uninitialized warning

Browse Source 
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>
This commit is contained in:
Arnd Bergmann 2016-11-22 15:33:44 +01:00 committed by Vineet Gupta
parent 60263dcd82
commit a26b0d4962
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/clocksource/timer-nps.c
View File

@ -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);