Messages in this thread Patch in this message |  | | From | Michael Walle <> | Subject | [PATCH 1/2] mtd: spi-nor: fix spi_nor_lock_and_prep() usage | Date | Tue, 7 Jan 2020 23:23:16 +0100 |
| |
lock_and_prep() and unlock_and_unprep() are asymmetrical. The second argument should be the same and represents the operation. This was correct before commit 8cc7f33aadc8 ("mtd: spi-nor: factor out replace-able flash_{lock,unlock}").
Fixes: 8cc7f33aadc8 ("mtd: spi-nor: factor out replace-able flash_{lock,unlock}") Signed-off-by: Michael Walle <michael@walle.cc> --- drivers/mtd/spi-nor/spi-nor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index b381bc0f825e..5cc4c0b331b3 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -2047,7 +2047,7 @@ static int spi_nor_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len) ret = nor->params.locking_ops->lock(nor, ofs, len); - spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_UNLOCK); + spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK); return ret; } @@ -2062,7 +2062,7 @@ static int spi_nor_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len) ret = nor->params.locking_ops->unlock(nor, ofs, len); - spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK); + spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_UNLOCK); return ret; } -- 2.20.1
|  |