diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-02 21:31:29 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-02 21:31:29 +0100 |
| commit | 33b9f582c5c1db515412cc7efff28f7d1779321f (patch) | |
| tree | 60ea1b403b41f651bc570f4c368ba82064880796 /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | 946342d03ec4e8367bba7bb99e7155e97f69058a (diff) | |
| parent | 008ca431822f39a023322b3598d8366faf46cfc1 (diff) | |
Merge branch 'cleanup' into for-linus
Conflicts:
arch/arm/plat-omap/dmtimer.c
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index a202a478510..ede9d495a9e 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -1666,7 +1666,7 @@ static int _deassert_hardreset(struct omap_hwmod *oh, const char *name) return -ENOSYS; ret = _lookup_hardreset(oh, name, &ohri); - if (IS_ERR_VALUE(ret)) + if (ret < 0) return ret; if (oh->clkdm) { @@ -2416,7 +2416,7 @@ static int __init _init(struct omap_hwmod *oh, void *data) _init_mpu_rt_base(oh, NULL); r = _init_clocks(oh, NULL); - if (IS_ERR_VALUE(r)) { + if (r < 0) { WARN(1, "omap_hwmod: %s: couldn't init clocks\n", oh->name); return -EINVAL; } |