From: Rafał Miłecki Date: Mon, 7 Dec 2015 19:30:51 +0000 (+0000) Subject: brcm47xx: make bcm47xxpart patch apply after recent backports X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=3dd2d2c152914341afcfbcde7742291a53c63617;p=15.05%2Fopenwrt.git brcm47xx: make bcm47xxpart patch apply after recent backports Signed-off-by: Rafał Miłecki Backport of r47806 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47808 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- 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);