diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2014-10-27 23:02:08 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-10-27 23:02:08 +0000 |
commit | c45a73ac33a699b8bd851b52f681b1ceddf6d3c0 (patch) | |
tree | 8b2c252e425f24f3a0b9d04ae7be4cf314cd7a24 /target/linux/bcm53xx/patches-3.18/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch | |
parent | 9a6776f829619ffda5511ed8772cdddbfde4d295 (diff) | |
download | upstream-c45a73ac33a699b8bd851b52f681b1ceddf6d3c0.tar.gz upstream-c45a73ac33a699b8bd851b52f681b1ceddf6d3c0.tar.bz2 upstream-c45a73ac33a699b8bd851b52f681b1ceddf6d3c0.zip |
bcm53xx: initial support for kernel 3.18
This adds initial support for kernel 3.18.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43097 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/bcm53xx/patches-3.18/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch')
-rw-r--r-- | target/linux/bcm53xx/patches-3.18/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch b/target/linux/bcm53xx/patches-3.18/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch new file mode 100644 index 0000000000..b8229cd38c --- /dev/null +++ b/target/linux/bcm53xx/patches-3.18/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch @@ -0,0 +1,34 @@ +From f41f8b42db092e505382f7120994de21590dff48 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> +Date: Thu, 16 Oct 2014 20:52:16 +0200 +Subject: [PATCH] UBI: Detect EOF mark and erase all remaining blocks +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Rafał Miłecki <zajec5@gmail.com> +--- + drivers/mtd/ubi/io.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/mtd/ubi/io.c ++++ b/drivers/mtd/ubi/io.c +@@ -727,6 +727,7 @@ bad: + * o %UBI_IO_FF if only 0xFF bytes were read (the PEB is supposedly empty) + * o a negative error code in case of failure. + */ ++static bool erase_all_next = false; + int ubi_io_read_ec_hdr(struct ubi_device *ubi, int pnum, + struct ubi_ec_hdr *ec_hdr, int verbose) + { +@@ -753,6 +754,10 @@ int ubi_io_read_ec_hdr(struct ubi_device + } + + magic = be32_to_cpu(ec_hdr->magic); ++ if (magic == 0xdeadc0de) ++ erase_all_next = true; ++ if (erase_all_next) ++ return read_err ? UBI_IO_FF_BITFLIPS : UBI_IO_FF; + if (magic != UBI_EC_HDR_MAGIC) { + if (mtd_is_eccerr(read_err)) + return UBI_IO_BAD_HDR_EBADMSG; |