summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens2012-02-01 00:13:53 +0100
committerJohn W. Linville2012-02-01 21:26:00 +0100
commita6c84622b7fa3ea5417a9d1d0ce0bc3e7fbe3be1 (patch)
tree11ac1064d1084662c1275d7edd146e07f6d4f9c8
parentiwlwifi: make "Tx aggregation enabled on ra =" be at DEBUG level (diff)
downloadkernel-qcow2-linux-a6c84622b7fa3ea5417a9d1d0ce0bc3e7fbe3be1.tar.gz
kernel-qcow2-linux-a6c84622b7fa3ea5417a9d1d0ce0bc3e7fbe3be1.tar.xz
kernel-qcow2-linux-a6c84622b7fa3ea5417a9d1d0ce0bc3e7fbe3be1.zip
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>
-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 520e8286db28..49d209173f55 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) {