diff options
author | Jonas Gorski <jogo@openwrt.org> | 2012-10-23 10:57:49 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2012-10-23 10:57:49 +0000 |
commit | 35c7b0ba8a06d128adf45ca58377299e988d4e84 (patch) | |
tree | f904045e1f8d4c1dd5faa36d9675c21b0e897ed2 /target/linux/generic | |
parent | fb185fea7d3e0af50bfc3eae37c190f132f9d8c6 (diff) | |
download | upstream-35c7b0ba8a06d128adf45ca58377299e988d4e84.tar.gz upstream-35c7b0ba8a06d128adf45ca58377299e988d4e84.tar.bz2 upstream-35c7b0ba8a06d128adf45ca58377299e988d4e84.zip |
kernel: move the bcma fallback sprom fix to generic
bcm63xx needs the bcma fallback sprom fix, too.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33896 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 15 |
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); + |