diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-02 22:31:29 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-02 22:31:29 +0200 |
| commit | 33b9f582c5c1db515412cc7efff28f7d1779321f (patch) | |
| tree | 60ea1b403b41f651bc570f4c368ba82064880796 /arch/arm/mach-omap2/powerdomain.c | |
| parent | Merge branches 'devel-stable', 'entry', 'fixes', 'mach-types', 'misc' and 'sm... (diff) | |
| parent | ARM: EXYNOS: remove unnecessary use of IS_ERR_VALUE() (diff) | |
| download | linux-33b9f582c5c1db515412cc7efff28f7d1779321f.tar.xz linux-33b9f582c5c1db515412cc7efff28f7d1779321f.zip | |
Merge branch 'cleanup' into for-linus
Conflicts:
arch/arm/plat-omap/dmtimer.c
Diffstat (limited to 'arch/arm/mach-omap2/powerdomain.c')
| -rw-r--r-- | arch/arm/mach-omap2/powerdomain.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c index 8e61d80bf6b3..43ac20c15f4f 100644 --- a/arch/arm/mach-omap2/powerdomain.c +++ b/arch/arm/mach-omap2/powerdomain.c @@ -1182,7 +1182,7 @@ bool pwrdm_can_ever_lose_context(struct powerdomain *pwrdm) { int i; - if (IS_ERR_OR_NULL(pwrdm)) { + if (!pwrdm) { pr_debug("powerdomain: %s: invalid powerdomain pointer\n", __func__); return 1; |