bcm53xx: refresh kernel patches

[openwrt/openwrt.git] / target / linux / bcm53xx / patches-3.18 / 500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch

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
index 06cb92b5fa864ae671c6614af7f64f4198de81ca..08d4790e2f21da3884c14f1d9c662bb33356fe27 100644 (file)
--- 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
@@ -13,11 +13,9 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  drivers/mtd/ubi/ubi.h    | 1 +
  3 files changed, 10 insertions(+)
 
-diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
-index 380268b..8f525c2 100644
 --- a/drivers/mtd/ubi/attach.c
 +++ b/drivers/mtd/ubi/attach.c
-@@ -95,6 +95,9 @@ static int self_check_ai(struct ubi_device *ubi, struct ubi_attach_info *ai);
+@@ -95,6 +95,9 @@ static int self_check_ai(struct ubi_devi
  static struct ubi_ec_hdr *ech;
  static struct ubi_vid_hdr *vidh;
  
@@ -27,7 +25,7 @@ index 380268b..8f525c2 100644
  /**
   * add_to_list - add physical eraseblock to a list.
   * @ai: attaching information
-@@ -1418,6 +1421,8 @@ int ubi_attach(struct ubi_device *ubi, int force_scan)
+@@ -1418,6 +1421,8 @@ int ubi_attach(struct ubi_device *ubi, i
        if (!ai)
                return -ENOMEM;
  
@@ -36,11 +34,9 @@ index 380268b..8f525c2 100644
  #ifdef CONFIG_MTD_UBI_FASTMAP
        /* On small flash devices we disable fastmap in any case. */
        if ((int)mtd_div_by_eb(ubi->mtd->size, ubi->mtd) <= UBI_FM_MAX_START) {
-diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
-index d361349..f3d29ce 100644
 --- a/drivers/mtd/ubi/io.c
 +++ b/drivers/mtd/ubi/io.c
-@@ -753,6 +753,10 @@ int ubi_io_read_ec_hdr(struct ubi_device *ubi, int pnum,
+@@ -753,6 +753,10 @@ int ubi_io_read_ec_hdr(struct ubi_device
        }
  
        magic = be32_to_cpu(ec_hdr->magic);
@@ -51,8 +47,6 @@ index d361349..f3d29ce 100644
        if (magic != UBI_EC_HDR_MAGIC) {
                if (mtd_is_eccerr(read_err))
                        return UBI_IO_BAD_HDR_EBADMSG;
-diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
-index 1259e72..142ee3d 100644
 --- a/drivers/mtd/ubi/ubi.h
 +++ b/drivers/mtd/ubi/ubi.h
 @@ -743,6 +743,7 @@ extern struct mutex ubi_devices_mutex;
@@ -63,6 +57,3 @@ index 1259e72..142ee3d 100644
  int ubi_add_to_av(struct ubi_device *ubi, struct ubi_attach_info *ai, int pnum,
                  int ec, const struct ubi_vid_hdr *vid_hdr, int bitflips);
  struct ubi_ainf_volume *ubi_find_av(const struct ubi_attach_info *ai,
--- 
-1.8.4.5
-