From ce97c0222ae1a0b4fa75249ea783539fcd841129 Mon Sep 17 00:00:00 2001 From: Jonathan Kliegman Date: Thu, 4 Apr 2013 15:15:49 +0900 Subject: [PATCH] --- yaml --- r: 370633 b: refs/heads/master c: 8521420375d0e6824a76fda24677f428c1d3f598 h: refs/heads/master i: 370631: c4af1829e580ddb0660ede048ce785ccc226cecd v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-exynos/include/mach/pm-core.h | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a5ad29a379ad..f214c5a89198 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 672b6829e7290cb4e51987fdcb1078f4eee6546c +refs/heads/master: 8521420375d0e6824a76fda24677f428c1d3f598 diff --git a/trunk/arch/arm/mach-exynos/include/mach/pm-core.h b/trunk/arch/arm/mach-exynos/include/mach/pm-core.h index 9d8da51e35ca..7dbbfec13ea5 100644 --- a/trunk/arch/arm/mach-exynos/include/mach/pm-core.h +++ b/trunk/arch/arm/mach-exynos/include/mach/pm-core.h @@ -27,13 +27,8 @@ static inline void s3c_pm_debug_init_uart(void) static inline void s3c_pm_arch_prepare_irqs(void) { - unsigned int tmp; - tmp = __raw_readl(S5P_WAKEUP_MASK); - tmp &= ~(1 << 31); - __raw_writel(tmp, S5P_WAKEUP_MASK); - - __raw_writel(s3c_irqwake_intmask, S5P_WAKEUP_MASK); __raw_writel(s3c_irqwake_eintmask, S5P_EINT_WAKEUP_MASK); + __raw_writel(s3c_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK); } static inline void s3c_pm_arch_stop_clocks(void)