diff options
| author | John Crispin <john@phrozen.org> | 2018-02-21 20:40:50 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2018-03-14 19:04:50 +0100 |
| commit | 54b275c8ed3ad20c447fd46deec83384822ac79d (patch) | |
| tree | 4198c9f77e467b316940cb78297d3030e67d67ea /target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch | |
| parent | b7f115f22a9d79bd45bfe27cfb8d491dac49feb4 (diff) | |
| download | upstream-54b275c8ed3ad20c447fd46deec83384822ac79d.tar.gz upstream-54b275c8ed3ad20c447fd46deec83384822ac79d.tar.bz2 upstream-54b275c8ed3ad20c447fd46deec83384822ac79d.zip | |
ipq40xx: add target
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Mathias Kresin <dev@kresin.me>
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch')
| -rw-r--r-- | target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch b/target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch new file mode 100644 index 0000000000..67ffb19e4d --- /dev/null +++ b/target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch @@ -0,0 +1,48 @@ +From eb94555e9e97c9983461214046b4d72c4ab4ba70 Mon Sep 17 00:00:00 2001 +From: Miquel Raynal <miquel.raynal@free-electrons.com> +Date: Thu, 30 Nov 2017 18:01:28 +0100 +Subject: [PATCH] mtd: nand: use usual return values for the ->erase() hook + +Avoid using specific defined values for checking returned status of the +->erase() hook. Instead, use usual negative error values on failure, +zero otherwise. + +Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons.com> +Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com> +Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> +--- + drivers/mtd/nand/denali.c | 2 +- + drivers/mtd/nand/docg4.c | 7 ++++++- + drivers/mtd/nand/nand_base.c | 10 ++++++++-- + 3 files changed, 15 insertions(+), 4 deletions(-) + +--- a/drivers/mtd/nand/nand_base.c ++++ b/drivers/mtd/nand/nand_base.c +@@ -2989,11 +2989,17 @@ out: + static int single_erase(struct mtd_info *mtd, int page) + { + struct nand_chip *chip = mtd_to_nand(mtd); ++ int status; ++ + /* Send commands to erase a block */ + chip->cmdfunc(mtd, NAND_CMD_ERASE1, -1, page); + chip->cmdfunc(mtd, NAND_CMD_ERASE2, -1, -1); + +- return chip->waitfunc(mtd, chip); ++ status = chip->waitfunc(mtd, chip); ++ if (status < 0) ++ return status; ++ ++ return status & NAND_STATUS_FAIL ? -EIO : 0; + } + + /** +@@ -3077,7 +3083,7 @@ int nand_erase_nand(struct mtd_info *mtd + status = chip->erase(mtd, page & chip->pagemask); + + /* See if block erase succeeded */ +- if (status & NAND_STATUS_FAIL) { ++ if (status) { + pr_debug("%s: failed erase, page 0x%08x\n", + __func__, page); + instr->state = MTD_ERASE_FAILED; |