aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2018-05-12 23:34:43 +0200
committerRafał Miłecki <rafal@milecki.pl>2018-05-14 09:44:40 +0200
commit7b54d52a443e7f8a9a0ce23003b42dcab5f64f96 (patch)
tree9d20e02a60948033481d3a49f6c559354b006def
parent3c81d12ec32844a731f37b011b30a3586731f98e (diff)
downloadupstream-7b54d52a443e7f8a9a0ce23003b42dcab5f64f96.tar.gz
upstream-7b54d52a443e7f8a9a0ce23003b42dcab5f64f96.tar.bz2
upstream-7b54d52a443e7f8a9a0ce23003b42dcab5f64f96.zip
kernel: use accepted version of bcm47xxpart fix commit
Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 404508001e9f2bbf09fc4c4027cf16b8720124db)
-rw-r--r--target/linux/generic/patches-4.4/042-v4.18-0009-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch (renamed from target/linux/generic/patches-4.4/141-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch)7
1 files changed, 6 insertions, 1 deletions
diff --git a/target/linux/generic/patches-4.4/141-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch b/target/linux/generic/patches-4.4/042-v4.18-0009-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
index 31acebf50f..eb3f9bdfc8 100644
--- a/target/linux/generic/patches-4.4/141-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
+++ b/target/linux/generic/patches-4.4/042-v4.18-0009-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
@@ -1,4 +1,6 @@
+From 237ea0d4762cc14d0fc80e80d61f0f08e1050c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Thu, 12 Apr 2018 07:24:52 +0200
Subject: [PATCH] mtd: bcm47xxpart: improve handling TRX partition size
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -6,7 +8,7 @@ Content-Transfer-Encoding: 8bit
When bcm47xxpart finds a TRX partition (container) it's supposed to jump
to the end of it and keep looking for more partitions. TRX and its
-subpartitions are handled be a separated parser.
+subpartitions are handled by a separate parser.
The problem with old code was relying on the length specified in a TRX
header. That isn't reliable as TRX is commonly modified to have checksum
@@ -22,7 +24,10 @@ This makes code more optimal & reliable thanks to skipping data that
shouldn't be parsed.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
---
+ drivers/mtd/bcm47xxpart.c | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c