diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2012-03-29 15:43:16 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-03-29 15:43:16 +0000 |
| commit | e0329692de29293241bda46b595b67b392186df9 (patch) | |
| tree | 7cf08d639cdecbd5ac32a6b3839776cb7e1af39b /target/linux/brcm47xx/patches-3.2/029-bcm47xx-read-nvram-from-sflash.patch | |
| parent | 6f8b023b69ba53cc90b4ab603ef8d5539a381888 (diff) | |
| download | upstream-e0329692de29293241bda46b595b67b392186df9.tar.gz upstream-e0329692de29293241bda46b595b67b392186df9.tar.bz2 upstream-e0329692de29293241bda46b595b67b392186df9.zip | |
brcm47xx: add missing breaks into the nvram read code in the switch case statements
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31142 3c298f89-4303-0410-b956-a3cf2f4a3e73
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"); + } |