git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'cleanup' into for-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
timer.c
diff --git
a/arch/arm/mach-omap2/timer.c
b/arch/arm/mach-omap2/timer.c
index f62b509ed08de75e6f4191bc8cf43dc130c7cb2d..a97026400af724efc8030d24ad4d80bc277ef082 100644
(file)
--- a/
arch/arm/mach-omap2/timer.c
+++ b/
arch/arm/mach-omap2/timer.c
@@
-287,7
+287,7
@@
static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
r = -EINVAL;
} else {
r = clk_set_parent(timer->fclk, src);
- if (
IS_ERR_VALUE(r)
)
+ if (
r < 0
)
pr_warn("%s: %s cannot set source\n",
__func__, oh->name);
clk_put(src);