summaryrefslogtreecommitdiffstats
path: root/drivers/ssb/main.c
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2008-02-19 17:46:48 +0100
committerJohn W. Linville <linville@tuxdriver.com>2008-02-20 20:11:49 -0500
commit7cb4461520f307a6e3fb2bb32cb8daee45aa1fae (patch)
tree24d287cb729e511285465456cdd0ec02805e9130 /drivers/ssb/main.c
parent53521d8c90d366191b6c134f88a8ebe83de60614 (diff)
downloadblackbird-op-linux-7cb4461520f307a6e3fb2bb32cb8daee45aa1fae.tar.gz
blackbird-op-linux-7cb4461520f307a6e3fb2bb32cb8daee45aa1fae.zip
ssb: Fix pcicore cardbus mode
This fixes the pcicore driver to not die a horrible crash death when inserting a cardbus card. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/ssb/main.c')
-rw-r--r--drivers/ssb/main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index af07ab22708f..bedb2b4ee9d2 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -557,6 +557,7 @@ static int ssb_fetch_invariants(struct ssb_bus *bus,
goto out;
memcpy(&bus->boardinfo, &iv.boardinfo, sizeof(iv.boardinfo));
memcpy(&bus->sprom, &iv.sprom, sizeof(iv.sprom));
+ bus->has_cardbus_slot = iv.has_cardbus_slot;
out:
return err;
}
OpenPOWER on IntegriCloud