diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-12-07 19:30:51 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-12-07 19:30:51 +0000 |
| commit | 3dd2d2c152914341afcfbcde7742291a53c63617 (patch) | |
| tree | e6e1ed04c450dd4a1fb019a6671efff0e7507b4e /target | |
| parent | 588cdd88a3252175a8df3d5ba74a9f94f4857140 (diff) | |
| download | upstream-3dd2d2c152914341afcfbcde7742291a53c63617.tar.gz upstream-3dd2d2c152914341afcfbcde7742291a53c63617.tar.bz2 upstream-3dd2d2c152914341afcfbcde7742291a53c63617.zip | |
brcm47xx: make bcm47xxpart patch apply after recent backports
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r47806
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47808 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch index df51191ad8..de109e35f4 100644 --- a/target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch +++ b/target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch @@ -1,14 +1,14 @@ --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c -@@ -97,6 +97,7 @@ static int bcm47xxpart_parse(struct mtd_ - int trx_part = -1; +@@ -100,6 +100,7 @@ static int bcm47xxpart_parse(struct mtd_ int last_trx_part = -1; int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, }; + int err; + bool found_nvram = false; /* * Some really old flashes (like AT45DB*) had smaller erasesize-s, but -@@ -300,12 +301,23 @@ static int bcm47xxpart_parse(struct mtd_ +@@ -306,12 +307,23 @@ static int bcm47xxpart_parse(struct mtd_ if (buf[0] == NVRAM_HEADER) { bcm47xxpart_add_part(&parts[curr_part++], "nvram", master->size - blocksize, 0); |