diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2012-01-27 20:10:51 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-01-27 20:10:51 +0000 |
commit | ffa86683314f3a1a32295fe9c55c79f4b3eae802 (patch) | |
tree | 848ee94ec14cd78f50513c1e8f3586ff2c16f712 /target/linux/brcm47xx | |
parent | b1afe3de3f877a0cef63cb0261b1a0f7d8bd4e62 (diff) | |
download | upstream-ffa86683314f3a1a32295fe9c55c79f4b3eae802.tar.gz upstream-ffa86683314f3a1a32295fe9c55c79f4b3eae802.tar.bz2 upstream-ffa86683314f3a1a32295fe9c55c79f4b3eae802.zip |
brcm47xx: add fix for cardbus host controller
These devices have two devices on the bus, the host controller itself and the device.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29923 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx')
-rw-r--r-- | target/linux/brcm47xx/patches-3.0/0045-ssb-fix-cardbus-in-hostmode.patch | 22 | ||||
-rw-r--r-- | target/linux/brcm47xx/patches-3.2/0045-ssb-fix-cardbus-in-hostmode.patch | 22 |
2 files changed, 44 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.0/0045-ssb-fix-cardbus-in-hostmode.patch b/target/linux/brcm47xx/patches-3.0/0045-ssb-fix-cardbus-in-hostmode.patch new file mode 100644 index 0000000000..4837fe740f --- /dev/null +++ b/target/linux/brcm47xx/patches-3.0/0045-ssb-fix-cardbus-in-hostmode.patch @@ -0,0 +1,22 @@ +From 7b90e7040b9783b91a4e2baf72ac32d3a00f9f2d Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens <hauke@hauke-m.de> +Date: Sat, 21 Jan 2012 11:18:25 +0100 +Subject: [PATCH 31/34] ssb: fix cardbus in hostmode + + +Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> +--- + drivers/ssb/driver_pcicore.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +--- a/drivers/ssb/driver_pcicore.c ++++ b/drivers/ssb/driver_pcicore.c +@@ -75,7 +75,7 @@ static u32 get_cfgspace_addr(struct ssb_ + u32 tmp; + + /* We do only have one cardbus device behind the bridge. */ +- if (pc->cardbusmode && (dev >= 1)) ++ if (pc->cardbusmode && (dev > 1)) + goto out; + + /* Type 0 transaction */ diff --git a/target/linux/brcm47xx/patches-3.2/0045-ssb-fix-cardbus-in-hostmode.patch b/target/linux/brcm47xx/patches-3.2/0045-ssb-fix-cardbus-in-hostmode.patch new file mode 100644 index 0000000000..4837fe740f --- /dev/null +++ b/target/linux/brcm47xx/patches-3.2/0045-ssb-fix-cardbus-in-hostmode.patch @@ -0,0 +1,22 @@ +From 7b90e7040b9783b91a4e2baf72ac32d3a00f9f2d Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens <hauke@hauke-m.de> +Date: Sat, 21 Jan 2012 11:18:25 +0100 +Subject: [PATCH 31/34] ssb: fix cardbus in hostmode + + +Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> +--- + drivers/ssb/driver_pcicore.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +--- a/drivers/ssb/driver_pcicore.c ++++ b/drivers/ssb/driver_pcicore.c +@@ -75,7 +75,7 @@ static u32 get_cfgspace_addr(struct ssb_ + u32 tmp; + + /* We do only have one cardbus device behind the bridge. */ +- if (pc->cardbusmode && (dev >= 1)) ++ if (pc->cardbusmode && (dev > 1)) + goto out; + + /* Type 0 transaction */ |