Merge branch 'for-3.4/fixes-for-final' of git://git.kernel.org/pub/sc…

…m/linux/kernel/git/swarren/linux-tegra into fixes * 'for-3.4/fixes-for-final' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: tegra: Fix flow controller accesses Signed-off-by: Arnd Bergmann <arnd@arndb.de>
mariux64 · May 16, 2012 · 1fb372f · 1fb372f
2 parents 139abbf + 97e7abc
commit 1fb372f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/arch/arm/mach-tegra/flowctrl.c b/arch/arm/mach-tegra/flowctrl.c
@@ -53,10 +53,10 @@ static void flowctrl_update(u8 offset, u32 value)
 
 void flowctrl_write_cpu_csr(unsigned int cpuid, u32 value)
 {
-	return flowctrl_update(flowctrl_offset_halt_cpu[cpuid], value);
+	return flowctrl_update(flowctrl_offset_cpu_csr[cpuid], value);
 }
 
 void flowctrl_write_cpu_halt(unsigned int cpuid, u32 value)
 {
-	return flowctrl_update(flowctrl_offset_cpu_csr[cpuid], value);
+	return flowctrl_update(flowctrl_offset_halt_cpu[cpuid], value);
 }