kernel: update kernel 4.4 to version 4.4.30

[openwrt/staging/lynxis/omap.git] / target / linux / layerscape / patches-4.4 / 1094-mtd-spi-nor-stop-passing-around-retlen.patch

diff --git a/target/linux/layerscape/patches-4.4/1094-mtd-spi-nor-stop-passing-around-retlen.patch b/target/linux/layerscape/patches-4.4/1094-mtd-spi-nor-stop-passing-around-retlen.patch
index 6223dfc1906e6d1ea24253a0d10ccfea83d8a36f..772eb9e70664f1c3ebd57ee60c5e538100631210 100644 (file)
--- a/target/linux/layerscape/patches-4.4/1094-mtd-spi-nor-stop-passing-around-retlen.patch
+++ b/target/linux/layerscape/patches-4.4/1094-mtd-spi-nor-stop-passing-around-retlen.patch
@@ -113,7 +113,7 @@ Integrated-by: Jiang Yutang <yutang.jiang@nxp.com>
        u8 cmd = nor->read_opcode;
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -919,12 +919,13 @@ static int spi_nor_read(struct mtd_info
+@@ -920,12 +920,13 @@ static int spi_nor_read(struct mtd_info
        if (ret)
                return ret;
  
@@ -128,7 +128,7 @@ Integrated-by: Jiang Yutang <yutang.jiang@nxp.com>
        return 0;
  }
  
-@@ -951,7 +952,7 @@ static int sst_write(struct mtd_info *mt
+@@ -952,7 +953,7 @@ static int sst_write(struct mtd_info *mt
                nor->program_opcode = SPINOR_OP_BP;
  
                /* write one byte. */
@@ -137,7 +137,7 @@ Integrated-by: Jiang Yutang <yutang.jiang@nxp.com>
                if (ret < 0)
                        goto sst_write_err;
                WARN(ret != 1, "While writing 1 byte written %i bytes\n",
-@@ -967,7 +968,7 @@ static int sst_write(struct mtd_info *mt
+@@ -968,7 +969,7 @@ static int sst_write(struct mtd_info *mt
                nor->program_opcode = SPINOR_OP_AAI_WP;
  
                /* write two bytes. */
@@ -146,7 +146,7 @@ Integrated-by: Jiang Yutang <yutang.jiang@nxp.com>
                if (ret < 0)
                        goto sst_write_err;
                WARN(ret != 2, "While writing 2 bytes written %i bytes\n",
-@@ -990,7 +991,7 @@ static int sst_write(struct mtd_info *mt
+@@ -991,7 +992,7 @@ static int sst_write(struct mtd_info *mt
                write_enable(nor);
  
                nor->program_opcode = SPINOR_OP_BP;
@@ -155,7 +155,7 @@ Integrated-by: Jiang Yutang <yutang.jiang@nxp.com>
                if (ret < 0)
                        goto sst_write_err;
                WARN(ret != 1, "While writing 1 byte written %i bytes\n",
-@@ -999,8 +1000,10 @@ static int sst_write(struct mtd_info *mt
+@@ -1000,8 +1001,10 @@ static int sst_write(struct mtd_info *mt
                if (ret)
                        goto sst_write_err;
                write_disable(nor);
@@ -166,7 +166,7 @@ Integrated-by: Jiang Yutang <yutang.jiang@nxp.com>
        spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
        return ret;
  }
-@@ -1029,15 +1032,17 @@ static int spi_nor_write(struct mtd_info
+@@ -1030,15 +1033,17 @@ static int spi_nor_write(struct mtd_info
  
        /* do all the bytes fit onto one page? */
        if (page_offset + len <= nor->page_size) {
@@ -186,7 +186,7 @@ Integrated-by: Jiang Yutang <yutang.jiang@nxp.com>
  
                /* write everything in nor->page_size chunks */
                for (i = ret; i < len; ) {
-@@ -1051,10 +1056,10 @@ static int spi_nor_write(struct mtd_info
+@@ -1052,10 +1057,10 @@ static int spi_nor_write(struct mtd_info
  
                        write_enable(nor);