summaryrefslogtreecommitdiff
path: root/drivers/ssb
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-01-31 23:13:53 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2012-02-01 20:26:00 (GMT)
commita6c84622b7fa3ea5417a9d1d0ce0bc3e7fbe3be1 (patch)
tree11ac1064d1084662c1275d7edd146e07f6d4f9c8 /drivers/ssb
parent5fb8c182d26472ea24cbbadb6a3e355d7621cca4 (diff)
downloadlinux-a6c84622b7fa3ea5417a9d1d0ce0bc3e7fbe3be1.tar.xz
ssb: fix cardbus slot in hostmode
ssb supports one extra device on the cardbus. This results in two devices in total, one beeing the host controller itself and the other the external device connected to the hostcontroller over cardbus. This makes the cardbus slot work on the Linksys WRT150N. Reported-by: Aaron Z <aaronz@pls-net.org> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/ssb')
-rw-r--r--drivers/ssb/driver_pcicore.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c
index 520e828..49d2091 100644
--- a/drivers/ssb/driver_pcicore.c
+++ b/drivers/ssb/driver_pcicore.c
@@ -75,7 +75,7 @@ static u32 get_cfgspace_addr(struct ssb_pcicore *pc,
u32 tmp;
/* We do only have one cardbus device behind the bridge. */
- if (pc->cardbusmode && (dev >= 1))
+ if (pc->cardbusmode && (dev > 1))
goto out;
if (bus == 0) {