diff options
| author | Nathan Hintz <nlhintz@hotmail.com> | 2012-05-04 21:56:32 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-05-16 12:46:03 -0400 |
| commit | 5fe2e0711dd9286e46f60f21c8cd580242cf8f89 (patch) | |
| tree | 140900aaf93cd7b8c5d6d3c21e18dd81defb1d70 /arch/mips/bcm47xx/sprom.c | |
| parent | 82a7c2bb5f57fd9f610f9e6d7c532033bebfa0cc (diff) | |
| download | blackbird-op-linux-5fe2e0711dd9286e46f60f21c8cd580242cf8f89.tar.gz blackbird-op-linux-5fe2e0711dd9286e46f60f21c8cd580242cf8f89.zip | |
bcma: Move initialization of SPROM to prevent overwrite
The first thing bcm47xx_fill_sprom does is initialize (zero fill) the SPROM. For
BCMA SOC, this wipes out any values previously read by bcm47xx_fill_sprom_ethernet
(see arch/mips/bcm47xx/setup.c - bcm47xx_get_sprom_bcma). Move the initialization
of SPROM so it is called prior to filling in any values.
Signed-off-by: Nathan Hintz <nlhintz@hotmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'arch/mips/bcm47xx/sprom.c')
| -rw-r--r-- | arch/mips/bcm47xx/sprom.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c index 17282e0d7835..d3a889745e20 100644 --- a/arch/mips/bcm47xx/sprom.c +++ b/arch/mips/bcm47xx/sprom.c @@ -557,8 +557,6 @@ void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom, const char *prefix) void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix) { - memset(sprom, 0, sizeof(struct ssb_sprom)); - bcm47xx_fill_sprom_ethernet(sprom, prefix); nvram_read_u8(prefix, NULL, "sromrev", &sprom->revision, 0); |
