aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx-2.6
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-03-25 16:25:15 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-03-25 16:25:15 +0000
commitb56546a0a81f3cc97a5dcf288b92c624cf742113 (patch)
treef4cb1c6f5ec31a5ac15cb2f9885fd40ddf833062 /target/linux/brcm47xx-2.6
parent7fdb2773d7e5519c4f55b8f286170041bcdc7d38 (diff)
downloadupstream-b56546a0a81f3cc97a5dcf288b92c624cf742113.tar.gz
upstream-b56546a0a81f3cc97a5dcf288b92c624cf742113.tar.bz2
upstream-b56546a0a81f3cc97a5dcf288b92c624cf742113.zip
add fix from #1516
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6697 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx-2.6')
-rw-r--r--target/linux/brcm47xx-2.6/files/drivers/ssb/driver_pci/pcicore.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_pci/pcicore.c b/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_pci/pcicore.c
index e025834950..d9aa22b351 100644
--- a/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_pci/pcicore.c
+++ b/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_pci/pcicore.c
@@ -162,7 +162,6 @@ static int ssb_extpci_read_config(struct ssb_pcicore *pc,
goto unmap;
}
- val = readl(mmio);
val >>= (8 * (off & 3));
switch (len) {
@@ -210,12 +209,10 @@ static int ssb_extpci_write_config(struct ssb_pcicore *pc,
switch (len) {
case 1:
- val = readl(mmio);
val &= ~(0xFF << (8 * (off & 3)));
val |= *((const u8 *)buf) << (8 * (off & 3));
break;
case 2:
- val = readl(mmio);
val &= ~(0xFFFF << (8 * (off & 3)));
val |= *((const u16 *)buf) << (8 * (off & 3));
break;
@@ -223,7 +220,7 @@ static int ssb_extpci_write_config(struct ssb_pcicore *pc,
val = *((const u32 *)buf);
break;
}
- writel(*((const u32 *)buf), mmio);
+ writel(val, mmio);
err = 0;
unmap: