On 02/11/19 4:53 PM, Tudor.Ambarus@xxxxxxxxxxxxx wrote: > From: Tudor Ambarus <tudor.ambarus@xxxxxxxxxxxxx> > > Check that all the bits written in the write_sr_and_check() method > match the status_new received value. Failing to write the other bits > is dangerous too, extend the check. > > Signed-off-by: Tudor Ambarus <tudor.ambarus@xxxxxxxxxxxxx> > --- Reviewed-by: Vignesh Raghavendra <vigneshr@xxxxxx> Regards Vignesh > drivers/mtd/spi-nor/spi-nor.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c > index 14146619bf19..8f5e9833081b 100644 > --- a/drivers/mtd/spi-nor/spi-nor.c > +++ b/drivers/mtd/spi-nor/spi-nor.c > @@ -960,8 +960,7 @@ static int spi_nor_write_sr(struct spi_nor *nor, const u8 *sr, size_t len) > } > > /* Write status register and ensure bits in mask match written values */ > -static int spi_nor_write_sr_and_check(struct spi_nor *nor, u8 status_new, > - u8 mask) > +static int spi_nor_write_sr_and_check(struct spi_nor *nor, u8 status_new) > { > int ret; > > @@ -975,7 +974,7 @@ static int spi_nor_write_sr_and_check(struct spi_nor *nor, u8 status_new, > if (ret) > return ret; > > - return ((nor->bouncebuf[0] & mask) != (status_new & mask)) ? -EIO : 0; > + return (nor->bouncebuf[0] != status_new) ? -EIO : 0; > } > > /** > @@ -1774,7 +1773,7 @@ static int stm_lock(struct spi_nor *nor, loff_t ofs, uint64_t len) > if ((status_new & mask) < (status_old & mask)) > return -EINVAL; > > - return spi_nor_write_sr_and_check(nor, status_new, mask); > + return spi_nor_write_sr_and_check(nor, status_new); > } > > /* > @@ -1859,7 +1858,7 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len) > if ((status_new & mask) > (status_old & mask)) > return -EINVAL; > > - return spi_nor_write_sr_and_check(nor, status_new, mask); > + return spi_nor_write_sr_and_check(nor, status_new); > } > > /* > -- Regards Vignesh ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/