Commit 05d090f0 authored by Dan Carpenter's avatar Dan Carpenter Committed by Cyrille Pitchen

mtd: spi-nor: Potential oops on error path in quad_enable()

Before commit cff959958832 ("mtd: spi-nor: introduce SPI 1-2-2 and SPI
1-4-4 protocols") then we treated 1 as -EINVAL in the caller but after
that commit we changed to propagate the return.  My static checker
complains that it's eventually passed to an ERR_PTR() and later
dereferenced, but I'm not totally certain if that's true.  Regardless,
returning 1 is wrong.
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarCyrille Pitchen <cyrille.pitchen@wedev4u.fr>
parent ddd0503e
...@@ -1389,8 +1389,9 @@ static int macronix_quad_enable(struct spi_nor *nor) ...@@ -1389,8 +1389,9 @@ static int macronix_quad_enable(struct spi_nor *nor)
write_sr(nor, val | SR_QUAD_EN_MX); write_sr(nor, val | SR_QUAD_EN_MX);
if (spi_nor_wait_till_ready(nor)) ret = spi_nor_wait_till_ready(nor);
return 1; if (ret)
return ret;
ret = read_sr(nor); ret = read_sr(nor);
if (!(ret > 0 && (ret & SR_QUAD_EN_MX))) { if (!(ret > 0 && (ret & SR_QUAD_EN_MX))) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment