aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-10-23 10:57:49 +0000
committerJonas Gorski <jogo@openwrt.org>2012-10-23 10:57:49 +0000
commit0d2cf5f9e363c8e41b32921b0ab2aa3d4621dfd5 (patch)
tree09c93a906a364f4e275d5e7fc3fec469617cf657 /target/linux/generic
parent0cc4bed41c7c8f11405f9a81ff212dd122b7879a (diff)
downloadupstream-0d2cf5f9e363c8e41b32921b0ab2aa3d4621dfd5.tar.gz
upstream-0d2cf5f9e363c8e41b32921b0ab2aa3d4621dfd5.tar.bz2
upstream-0d2cf5f9e363c8e41b32921b0ab2aa3d4621dfd5.zip
kernel: move the bcma fallback sprom fix to generic
bcm63xx needs the bcma fallback sprom fix, too. SVN-Revision: 33896
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.3/029-bcma-use-fallback-sprom-if-sprom-on-card-was-not-val.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.3/029-bcma-use-fallback-sprom-if-sprom-on-card-was-not-val.patch b/target/linux/generic/patches-3.3/029-bcma-use-fallback-sprom-if-sprom-on-card-was-not-val.patch
new file mode 100644
index 0000000000..b6e6480567
--- /dev/null
+++ b/target/linux/generic/patches-3.3/029-bcma-use-fallback-sprom-if-sprom-on-card-was-not-val.patch
@@ -0,0 +1,15 @@
+--- a/drivers/bcma/sprom.c
++++ b/drivers/bcma/sprom.c
+@@ -591,8 +591,11 @@ int bcma_sprom_get(struct bcma_bus *bus)
+ bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, true);
+
+ err = bcma_sprom_valid(sprom);
+- if (err)
++ if (err) {
++ bcma_warn(bus, "invalid sprom read from the PCIe card, try to use fallback sprom\n");
++ err = bcma_fill_sprom_with_fallback(bus, &bus->sprom);
+ goto out;
++ }
+
+ bcma_sprom_extract_r8(bus, sprom);
+