hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mtd: spi-nor: Don't overwrite errno from Reg Ops 

Do not overwrite the error numbers received the Register Operations
methods.

Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
This commit is contained in:
Tudor Ambarus 2019-10-29 11:16:59 +00:00
parent 17ccd0e487
commit 7380f79c11
No known key found for this signature in database
GPG Key ID: 4B554F47A58D14E9
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/mtd/spi-nor/spi-nor.c
View File

@ -1364,10 +1364,9 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr)
spi_nor_write_enable(nor);
if (spi_nor_erase_chip(nor)) {
ret = -EIO;
ret = spi_nor_erase_chip(nor);
if (ret)
goto erase_err;
}
/*
* Scale the timeout linearly with the size of the flash, with
@ -1839,7 +1838,7 @@ static int spansion_no_read_cr_quad_enable(struct spi_nor *nor)
ret = spi_nor_read_sr(nor);
if (ret < 0) {
dev_err(nor->dev, "error while reading status register\n");
return -EINVAL;
return ret;
}
sr_cr[0] = ret;
sr_cr[1] = CR_QUAD_EN_SPAN;
@ -1870,7 +1869,7 @@ static int spansion_read_cr_quad_enable(struct spi_nor *nor)
ret = spi_nor_read_cr(nor);
if (ret < 0) {
dev_err(dev, "error while reading configuration register\n");
return -EINVAL;
return ret;
}
if (ret & CR_QUAD_EN_SPAN)
@ -1882,7 +1881,7 @@ static int spansion_read_cr_quad_enable(struct spi_nor *nor)
ret = spi_nor_read_sr(nor);
if (ret < 0) {
dev_err(dev, "error while reading status register\n");
return -EINVAL;
return ret;
}
sr_cr[0] = ret;
@ -1932,7 +1931,7 @@ static int sr2_bit7_quad_enable(struct spi_nor *nor)
ret = spi_nor_write_sr2(nor, sr2);
if (ret) {
dev_err(nor->dev, "error while writing status register 2\n");
return -EINVAL;
return ret;
}
ret = spi_nor_wait_till_ready(nor);