CNS3xxx: Fix PCI cns3xxx_write_config()

Commit Message

Krzysztof Hałasa March 11, 2016, 11:32 a.m. UTC

The "where" offset was added twice, fix it.

Signed-off-by: Krzysztof Ha?asa <[e-mail]>
Fixes: 498a92d42596 ("ARM: cns3xxx: pci: avoid potential stack overflow")

Comments

Olof Johansson March 13, 2016, 1:02 a.m. UTC | #1

On Fri, Mar 11, 2016 at 12:32:14PM +0100, Krzysztof Halasa wrote:
> The "where" offset was added twice, fix it.
> 
> Signed-off-by: Krzysztof Ha??asa <[e-mail]>
> Fixes: 498a92d42596 ("ARM: cns3xxx: pci: avoid potential stack overflow")

Thanks, applied to next/fixes-non-critical.


-Olof

Patch

diff --git a/arch/arm/mach-cns3xxx/pcie.c b/arch/arm/mach-cns3xxx/pcie.c
index 47905a5..318394e 100644
--- a/arch/arm/mach-cns3xxx/pcie.c
+++ b/arch/arm/mach-cns3xxx/pcie.c
@@ -220,13 +220,13 @@  static void cns3xxx_write_config(struct cns3xxx_pcie *cnspci,
 	u32 mask = (0x1ull << (size * 8)) - 1;
 	int shift = (where % 4) * 8;
 
-	v = readl_relaxed(base + (where & 0xffc));
+	v = readl_relaxed(base);
 
 	v &= ~(mask << shift);
 	v |= (val & mask) << shift;
 
-	writel_relaxed(v, base + (where & 0xffc));
-	readl_relaxed(base + (where & 0xffc));
+	writel_relaxed(v, base);
+	readl_relaxed(base);
 }
 
 static void __init cns3xxx_pcie_hw_init(struct cns3xxx_pcie *cnspci)