diff options
| author |   Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2019-10-31 23:37:27 +0300 |
|---|---|---|
| committer |   Vignesh Raghavendra <vigneshr@ti.com> | 2019-11-09 14:43:41 +0530 |
| commit | 72914a8cff7e1d910c58e125e15a0da409e3135f (patch) | |
| tree | 43651d00d60efb21c55c46012a8c7a14cefd8a4f /drivers/mtd | |
| parent | mtd: cfi_cmdset_0002: don't free cfi->cfiq in error path of cfi_amdstd_setup() (diff) | |
| download | linux-dev-72914a8cff7e1d910c58e125e15a0da409e3135f.tar.xz linux-dev-72914a8cff7e1d910c58e125e15a0da409e3135f.zip | |
mtd: cfi_cmdset_0002: only check errors when ready in cfi_check_err_status()
Cypress S26K{L|S}P{128|256|512}S datasheet says that the error bits in
the status register are only valid when the "device ready" bit 7 is set.
Add the check for the device ready bit in cfi_check_err_status() as that
function isn't always called with this bit set.
Fixes: 4844ef80305d ("mtd: cfi_cmdset_0002: Add support for polling status register")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/chips/cfi_cmdset_0002.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index 5b2a25b49333..d5c2e5430241 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -136,6 +136,10 @@ static void cfi_check_err_status(struct map_info *map, struct flchip *chip, cfi->device_type, NULL); status = map_read(map, adr); + /* The error bits are invalid while the chip's busy */ + if (!map_word_bitsset(map, status, CMD(CFI_SR_DRB))) + return; + if (map_word_bitsset(map, status, CMD(0x3a))) { unsigned long chipstatus = MERGESTATUS(status); |