aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-4.1/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-12-07 09:31:52 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-12-07 09:31:52 +0000
commit8a591d21920ebb402691277199fbae6c966462e0 (patch)
tree26a76941bfe7b845ab28c902e8fd75f0192b3fb8 /target/linux/bcm53xx/patches-4.1/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch
parent1a6a85d480af3bd2d463906580676ac8366c0686 (diff)
downloadmaster-187ad058-8a591d21920ebb402691277199fbae6c966462e0.tar.gz
master-187ad058-8a591d21920ebb402691277199fbae6c966462e0.tar.bz2
master-187ad058-8a591d21920ebb402691277199fbae6c966462e0.zip
kernel: add bcm47xxpart patches sent for 4.5 merge window
This replaces old bcm53xx patch for scanning whole flash and makes bcm47xxpart compatible with NAND. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47800 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/bcm53xx/patches-4.1/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch')
-rw-r--r--target/linux/bcm53xx/patches-4.1/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm53xx/patches-4.1/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch b/target/linux/bcm53xx/patches-4.1/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch
index c1dfa92013..774a186263 100644
--- a/target/linux/bcm53xx/patches-4.1/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch
+++ b/target/linux/bcm53xx/patches-4.1/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch
@@ -22,7 +22,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
#include <uapi/linux/magic.h>
-@@ -135,6 +136,17 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -132,6 +133,17 @@ static int bcm47xxpart_parse(struct mtd_
break;
}
@@ -38,5 +38,5 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+ }
+
/* Read beginning of the block */
- if (mtd_read(master, offset, BCM47XXPART_BYTES_TO_READ,
- &bytes_read, (uint8_t *)buf) < 0) {
+ err = mtd_read(master, offset, BCM47XXPART_BYTES_TO_READ,
+ &bytes_read, (uint8_t *)buf);