Message ID | 20210925173318.25804-3-kabel@kernel.org |
---|---|
State | Superseded |
Delegated to: | Jagannadha Sutradharudu Teki |
Headers | show |
Series | Fix `mtd erase` when used with mtdpart | expand |
On 25/09/21 07:33PM, Marek Behún wrote: > From: Marek Behún <marek.behun@nic.cz> > > The spi_nor_erase() function does not check return value of the > write_enable() call. Fix this. This is the case for many more calls for write_enable(), but we can fix them later I suppose. Reviewed-by: Pratyush Yadav <p.yadav@ti.com> > > Signed-off-by: Marek Behún <marek.behun@nic.cz> > Reviewed-by: Simon Glass <sjg@chromium.org> > Reviewed-by: Jagan Teki <jagan@amarulasolutions.com> > Tested-by: Masami Hiramatsu <masami.hiramatsu@linaro.org> > --- > drivers/mtd/spi/spi-nor-core.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c > index 529e7e9178..d2018ab702 100644 > --- a/drivers/mtd/spi/spi-nor-core.c > +++ b/drivers/mtd/spi/spi-nor-core.c > @@ -929,7 +929,9 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr) > if (ret < 0) > goto erase_err; > #endif > - write_enable(nor); > + ret = write_enable(nor); > + if (ret < 0) > + goto erase_err; > > ret = spi_nor_erase_sector(nor, addr); > if (ret < 0) > -- > 2.32.0 >
diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index 529e7e9178..d2018ab702 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -929,7 +929,9 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr) if (ret < 0) goto erase_err; #endif - write_enable(nor); + ret = write_enable(nor); + if (ret < 0) + goto erase_err; ret = spi_nor_erase_sector(nor, addr); if (ret < 0)