From: Krzysztof Halasa Date: Fri, 11 Mar 2016 11:32:14 +0000 (+0100) Subject: CNS3xxx: Fix PCI cns3xxx_write_config() X-Git-Tag: v4.6-rc1~78^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=88e9da9a2a70b6f1a171fbf30a681d6bc4031c4d;p=karo-tx-linux.git CNS3xxx: Fix PCI cns3xxx_write_config() The "where" offset was added twice, fix it. Signed-off-by: Krzysztof Hałasa Fixes: 498a92d42596 ("ARM: cns3xxx: pci: avoid potential stack overflow") Signed-off-by: Olof Johansson --- diff --git a/arch/arm/mach-cns3xxx/pcie.c b/arch/arm/mach-cns3xxx/pcie.c index 47905a50e075..318394ed5c7a 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)