diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-05-03 20:18:41 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-05-03 20:18:41 +0000 |
| commit | 22b2e3fbb9cc78d671e44f788a062031c97ffc6f (patch) | |
| tree | 6395b1a6324793714e3d8d770a71cdc9362da4e1 /target/linux/brcm47xx/patches-3.3/060-bcma-use-fallback-sprom-if-no-on-chip-sprom-is-avail.patch | |
| parent | 8e9d914343967982a1a48e80000bbb09161e636c (diff) | |
| download | upstream-22b2e3fbb9cc78d671e44f788a062031c97ffc6f.tar.gz upstream-22b2e3fbb9cc78d671e44f788a062031c97ffc6f.tar.bz2 upstream-22b2e3fbb9cc78d671e44f788a062031c97ffc6f.zip | |
brcm47xx: add support for kernel 3.3
SVN-Revision: 31573
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/060-bcma-use-fallback-sprom-if-no-on-chip-sprom-is-avail.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.3/060-bcma-use-fallback-sprom-if-no-on-chip-sprom-is-avail.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/060-bcma-use-fallback-sprom-if-no-on-chip-sprom-is-avail.patch b/target/linux/brcm47xx/patches-3.3/060-bcma-use-fallback-sprom-if-no-on-chip-sprom-is-avail.patch new file mode 100644 index 0000000000..abc638d244 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.3/060-bcma-use-fallback-sprom-if-no-on-chip-sprom-is-avail.patch @@ -0,0 +1,24 @@ +--- a/drivers/bcma/sprom.c ++++ b/drivers/bcma/sprom.c +@@ -404,16 +404,19 @@ int bcma_sprom_get(struct bcma_bus *bus) + return -EOPNOTSUPP; + + if (!bcma_sprom_ext_available(bus)) { ++ bool sprom_onchip; ++ + /* + * External SPROM takes precedence so check + * on-chip OTP only when no external SPROM + * is present. + */ +- if (bcma_sprom_onchip_available(bus)) { ++ sprom_onchip = bcma_sprom_onchip_available(bus); ++ if (sprom_onchip) { + /* determine offset */ + offset = bcma_sprom_onchip_offset(bus); + } +- if (!offset) { ++ if (!offset || !sprom_onchip) { + /* + * Maybe there is no SPROM on the device? + * Now we ask the arch code if there is some sprom |