diff for duplicates of <5714F185.5080103@ti.com> diff --git a/a/1.txt b/N1/1.txt index dbaa8b4..538a69b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -97,23 +97,3 @@ That is correct. > So, the below patch works as well. Please feel free to fold it with your patch. - --- -cheers, --roger - -diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c -index e622a1b..eb85d6b 100644 ---- a/drivers/mtd/nand/omap2.c -+++ b/drivers/mtd/nand/omap2.c -@@ -1547,8 +1547,8 @@ static int omap_read_page_bch(struct mtd_info *mtd, struct nand_chip *chip, - chip->read_buf(mtd, buf, mtd->writesize); - - /* Read oob bytes */ -- chip->cmdfunc(mtd, NAND_CMD_RNDOUT, mtd->writesize, -1); -- chip->read_buf(mtd, chip->oob_poi, mtd->oobsize); -+ chip->cmdfunc(mtd, NAND_CMD_RNDOUT, mtd->writesize + BADBLOCK_MARKER_LENGTH, -1); -+ chip->read_buf(mtd, chip->oob_poi, chip->ecc.total); - - /* Calculate ecc bytes */ - chip->ecc.calculate(mtd, buf, ecc_calc); diff --git a/a/content_digest b/N1/content_digest index 0f61d0f..207f60e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -18,16 +18,16 @@ "Date\0Mon, 18 Apr 2016 17:39:01 +0300\0" "To\0Boris Brezillon <boris.brezillon@free-electrons.com>\0" "Cc\0Tony Lindgren <tony@atomide.com>" - <javier@dowhile0.org> - <fcooper@ti.com> - <nsekhar@ti.com> - <linux-mtd@lists.infradead.org> - <linux-omap@vger.kernel.org> - <computersforpeace@gmail.com> - <dwmw2@infradead.org> - <ezequiel@vanguardiasur.com.ar> - <devicetree@vger.kernel.org> - " <linux-kernel@vger.kernel.org>\0" + javier@dowhile0.org + fcooper@ti.com + nsekhar@ti.com + linux-mtd@lists.infradead.org + linux-omap@vger.kernel.org + computersforpeace@gmail.com + dwmw2@infradead.org + ezequiel@vanguardiasur.com.ar + devicetree@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On 18/04/16 17:10, Boris Brezillon wrote:\n" @@ -128,26 +128,6 @@ "> \n" "> \n" "\n" - "So, the below patch works as well. Please feel free to fold it with your patch.\n" - "\n" - "--\n" - "cheers,\n" - "-roger\n" - "\n" - "diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c\n" - "index e622a1b..eb85d6b 100644\n" - "--- a/drivers/mtd/nand/omap2.c\n" - "+++ b/drivers/mtd/nand/omap2.c\n" - "@@ -1547,8 +1547,8 @@ static int omap_read_page_bch(struct mtd_info *mtd, struct nand_chip *chip,\n" - " \tchip->read_buf(mtd, buf, mtd->writesize);\n" - " \n" - " \t/* Read oob bytes */\n" - "-\tchip->cmdfunc(mtd, NAND_CMD_RNDOUT, mtd->writesize, -1);\n" - "-\tchip->read_buf(mtd, chip->oob_poi, mtd->oobsize);\n" - "+\tchip->cmdfunc(mtd, NAND_CMD_RNDOUT, mtd->writesize + BADBLOCK_MARKER_LENGTH, -1);\n" - "+\tchip->read_buf(mtd, chip->oob_poi, chip->ecc.total);\n" - " \n" - " \t/* Calculate ecc bytes */\n" - " \tchip->ecc.calculate(mtd, buf, ecc_calc);" + So, the below patch works as well. Please feel free to fold it with your patch. -dda104951af63bc657edae0ca8ae322ce5f4bf7e07f4d20886c586031566362b +f9190491257ff8e89ea98145e93be8fbce39a87f413458ee5dffd9946f2da1de
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.