aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/files/arch/mips/bcm947xx
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2008-02-19 16:50:12 +0000
committerMichael Büsch <mb@bu3sch.de>2008-02-19 16:50:12 +0000
commite7e5ebd0c2432b0c8b9d7269dfb074772ad95535 (patch)
treed4bbc87de4570a3aa84450932518c9c862c34d93 /target/linux/brcm47xx/files/arch/mips/bcm947xx
parentfaa14263f5f9617a91b4d8335f93814522c8d42b (diff)
downloadupstream-e7e5ebd0c2432b0c8b9d7269dfb074772ad95535.tar.gz
upstream-e7e5ebd0c2432b0c8b9d7269dfb074772ad95535.tar.bz2
upstream-e7e5ebd0c2432b0c8b9d7269dfb074772ad95535.zip
ssb: Fix the horrible crash of innocent cardbus cards.
No Animals were harmed in the production of this patch. SVN-Revision: 10497
Diffstat (limited to 'target/linux/brcm47xx/files/arch/mips/bcm947xx')
-rw-r--r--target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c b/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
index 2c106c9b26..85ff1cf813 100644
--- a/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
+++ b/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
@@ -158,6 +158,9 @@ static int bcm47xx_get_invariants(struct ssb_bus *bus, struct ssb_init_invariant
bcm47xx_fill_sprom(&iv->sprom);
+ if ((s = nvram_get("cardbus")))
+ iv->has_cardbus_slot = !!simple_strtoul(s, NULL, 10);
+
return 0;
}