projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
clocksource
/
timer-integrator-ap.c
diff --git
a/drivers/clocksource/timer-integrator-ap.c
b/drivers/clocksource/timer-integrator-ap.c
index d7d21e4dcef0196f85bfd9383b9d089882076724..a68866e0ecd4d66d6fdf6823f9d2296cd6245555 100644
(file)
--- a/
drivers/clocksource/timer-integrator-ap.c
+++ b/
drivers/clocksource/timer-integrator-ap.c
@@
-167,7
+167,7
@@
static void __init integrator_ap_timer_init_of(struct device_node *node)
struct device_node *sec_node;
base = of_io_request_and_map(node, 0, "integrator-timer");
- if (
!base
)
+ if (
IS_ERR(base)
)
return;
clk = of_clk_get(node, 0);