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 branch 'cgroup-rmdir-updates' into cgroup/for-3.8
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap2
/
timer.c
diff --git
a/arch/arm/mach-omap2/timer.c
b/arch/arm/mach-omap2/timer.c
index 8847d6eb23131b7df5e32c94fea1b8a4018f15fa..44f9aa7ec0c0a63e089137342accb6a52ab48ef7 100644
(file)
--- a/
arch/arm/mach-omap2/timer.c
+++ b/
arch/arm/mach-omap2/timer.c
@@
-378,7
+378,7
@@
static void __init realtime_counter_init(void)
return;
}
sys_clk = clk_get(NULL, "sys_clkin_ck");
- if (
!sys_clk
) {
+ if (
IS_ERR(sys_clk)
) {
pr_err("%s: failed to get system clock handle\n", __func__);
iounmap(base);
return;