summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2016-01-29 22:25:31 +0300
committerBrian Norris <computersforpeace@gmail.com>2016-03-08 05:01:54 +0300
commit4c0dba447ef4a97dfbae6e876312e952667eddc4 (patch)
tree631c6a9caa023a440db842ffbd7562adaaff6aa6
parentedf891ef9ab773363f8e58022a26d7d31604aed6 (diff)
downloadlinux-4c0dba447ef4a97dfbae6e876312e952667eddc4.tar.xz
mtd: spi-nor: silently drop lock/unlock for already locked/unlocked region
If, for instance, the entire flash is already unlocked and I try to mtd_unlock() the entire device, I don't expect to see an EINVAL error. It should just silently succeed. Ditto for mtd_lock(). Signed-off-by: Brian Norris <computersforpeace@gmail.com> Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
-rw-r--r--drivers/mtd/spi-nor/spi-nor.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index a9b3bdf28c90..3dde727f8591 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -515,8 +515,12 @@ static int stm_lock(struct spi_nor *nor, loff_t ofs, uint64_t len)
status_new = (status_old & ~mask) | val;
+ /* Don't bother if they're the same */
+ if (status_new == status_old)
+ return 0;
+
/* Only modify protection if it will not unlock other areas */
- if ((status_new & mask) <= (status_old & mask))
+ if ((status_new & mask) < (status_old & mask))
return -EINVAL;
write_enable(nor);
@@ -569,8 +573,12 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len)
status_new = (status_old & ~mask) | val;
+ /* Don't bother if they're the same */
+ if (status_new == status_old)
+ return 0;
+
/* Only modify protection if it will not lock other areas */
- if ((status_new & mask) >= (status_old & mask))
+ if ((status_new & mask) > (status_old & mask))
return -EINVAL;
write_enable(nor);