In the recent SPROM commit:
MIPS: BCM47xx: Read board info for all bcma buses
a proper handling of "fallback" argument has been dropped. Restore it.
Signed-off-by: Rafał Miłecki <zajec5@xxxxxxxxx>
---
arch/mips/bcm47xx/sprom.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
index 8485143..b0d62e7 100644
--- a/arch/mips/bcm47xx/sprom.c
+++ b/arch/mips/bcm47xx/sprom.c
@@ -698,6 +698,7 @@ static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
struct bcma_device *core;
char buf[10];
char *prefix;
+ bool fallback = false;
switch (bus->hosttype) {
case BCMA_HOSTTYPE_PCI:
@@ -715,6 +716,7 @@ static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
snprintf(buf, sizeof(buf), "sb/%u/",
core->core_index);
prefix = buf;
+ fallback = true;
} else {
prefix = NULL;
}
@@ -729,7 +731,7 @@ static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
binfo->vendor = SSB_BOARDVENDOR_BCM;
nvram_read_u16(prefix, NULL, "boardtype", &binfo->type, 0, true);
- bcm47xx_fill_sprom(out, prefix, false);
+ bcm47xx_fill_sprom(out, prefix, fallback);
return 0;
}
--
1.8.4.5
