diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-02 16:31:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-02 16:31:29 -0400 |
| commit | 33b9f582c5c1db515412cc7efff28f7d1779321f (patch) | |
| tree | 60ea1b403b41f651bc570f4c368ba82064880796 /arch/arm/mach-omap2/powerdomain.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/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) | |||
| 1182 | { | 1182 | { |
| 1183 | int i; | 1183 | int i; |
| 1184 | 1184 | ||
| 1185 | if (IS_ERR_OR_NULL(pwrdm)) { | 1185 | if (!pwrdm) { |
| 1186 | pr_debug("powerdomain: %s: invalid powerdomain pointer\n", | 1186 | pr_debug("powerdomain: %s: invalid powerdomain pointer\n", |
| 1187 | __func__); | 1187 | __func__); |
| 1188 | return 1; | 1188 | return 1; |