diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-03-29 15:43:16 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-03-29 15:43:16 +0000 |
| commit | 9992ce3a51bd8a35fb62fa699dc1c85865bafb66 (patch) | |
| tree | 9957d69db98cc5581606c6e8daed110f5bf23c60 /target/linux/brcm47xx/patches-3.2/029-bcm47xx-read-nvram-from-sflash.patch | |
| parent | 5f87ce91505792bc1482e1f62a8f1c1691d948d7 (diff) | |
| download | upstream-9992ce3a51bd8a35fb62fa699dc1c85865bafb66.tar.gz upstream-9992ce3a51bd8a35fb62fa699dc1c85865bafb66.tar.bz2 upstream-9992ce3a51bd8a35fb62fa699dc1c85865bafb66.zip | |
brcm47xx: add missing breaks into the nvram read code in the switch case statements
SVN-Revision: 31142
Diffstat (limited to 'target/linux/brcm47xx/patches-3.2/029-bcm47xx-read-nvram-from-sflash.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.2/029-bcm47xx-read-nvram-from-sflash.patch | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/target/linux/brcm47xx/patches-3.2/029-bcm47xx-read-nvram-from-sflash.patch b/target/linux/brcm47xx/patches-3.2/029-bcm47xx-read-nvram-from-sflash.patch index 2fc43dc3b4..b3d13df39f 100644 --- a/target/linux/brcm47xx/patches-3.2/029-bcm47xx-read-nvram-from-sflash.patch +++ b/target/linux/brcm47xx/patches-3.2/029-bcm47xx-read-nvram-from-sflash.patch @@ -24,7 +24,7 @@ base = bcma_cc->pflash.window; lim = bcma_cc->pflash.window_size; break; -@@ -86,7 +84,106 @@ found: +@@ -86,7 +84,110 @@ found: for (i = 0; i < sizeof(struct nvram_header); i += 4) *dst++ = *src++; for (; i < header->len && i < NVRAM_SPACE; i += 4) @@ -87,10 +87,12 @@ + switch (bcm47xx_bus.ssb.chipco.flash_type) { + case SSB_PFLASH: + early_nvram_init_pflash(); ++ break; + case SSB_SFLASH: + err = early_nvram_init_sflash(); + if (err < 0) + printk(KERN_WARNING "can not read from flash: %i\n", err); ++ break; + default: + printk(KERN_WARNING "unknow flash type\n"); + } @@ -105,10 +107,12 @@ + switch (bcm47xx_bus.bcma.bus.drv_cc.flash_type) { + case BCMA_PFLASH: + early_nvram_init_pflash(); ++ break; + case BCMA_SFLASH: + err = early_nvram_init_sflash(); + if (err < 0) + printk(KERN_WARNING "can not read from flash: %i\n", err); ++ break; + default: + printk(KERN_WARNING "unknow flash type\n"); + } |