41a881a8d9
Right patch version this time, sorry! * Patch 180-usb-xhci-add-support-for-performing-fake-doorbell.patch had to be adjusted slightly because of upstream adapted code. * Refreshed patches. Compile-tested: ramips/mt7621, x86/64 Run-tested: ramips/mt7621, x86/64 Signed-off-by: Stijn Segers <foss@volatilesystems.org> Tested-by: Rosen Penev <rosenp@gmail.com>
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
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
|
|
@@ -2994,11 +2994,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;
|
|
}
|
|
|
|
/**
|
|
@@ -3082,7 +3088,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;
|