diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-17 06:22:42 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-17 06:22:42 +0400 |
| commit | 20804abdbcfced47b460e5794a685d48225ac754 (patch) | |
| tree | b014e30e62deaf177300bc667cbc5ff855e0be2d /arch/arm/mach-omap2/omap-wakeupgen.c | |
| parent | a95aa84f5ef257ee1e5c408dc0734a8bb121ed99 (diff) | |
| parent | 3c5dc4a7daa6e64e39412fe9c7daa298834de623 (diff) | |
| download | linux-20804abdbcfced47b460e5794a685d48225ac754.tar.xz | |
Merge tag 'omap-fixes-noncritical-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical
From Tony Lindgren:
Non critical omap fixes that we not considered necessary
for the v3.6 -rc cycle.
* tag 'omap-fixes-noncritical-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write
ARM: OMAP4: wakeupgen: Fix the typo in AUXCOREBOOT register save
gpio/omap: fix possible memory leak in omap2_gpio_dev_init()
Diffstat (limited to 'arch/arm/mach-omap2/omap-wakeupgen.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap-wakeupgen.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c index 05fdebfaa195..567f672ca37e 100644 --- a/arch/arm/mach-omap2/omap-wakeupgen.c +++ b/arch/arm/mach-omap2/omap-wakeupgen.c @@ -229,13 +229,7 @@ static inline void omap4_irq_save_context(void) /* Save AuxBoot* registers */ val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0); __raw_writel(val, sar_base + AUXCOREBOOT0_OFFSET); - val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0); - __raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET); - - /* Save SyncReq generation logic */ - val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0); - __raw_writel(val, sar_base + AUXCOREBOOT0_OFFSET); - val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0); + val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_1); __raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET); /* Save SyncReq generation logic */ |