diff options
| author | Brian Norris | 2016-01-29 20:25:31 +0100 |
|---|---|---|
| committer | Brian Norris | 2016-03-08 03:01:54 +0100 |
| commit | 4c0dba447ef4a97dfbae6e876312e952667eddc4 (patch) | |
| tree | 631c6a9caa023a440db842ffbd7562adaaff6aa6 /drivers/mtd/spi-nor/spi-nor.c | |
| parent | mtd: spi-nor: wait for SR_WIP to clear on initial unlock (diff) | |
| download | kernel-qcow2-linux-4c0dba447ef4a97dfbae6e876312e952667eddc4.tar.gz kernel-qcow2-linux-4c0dba447ef4a97dfbae6e876312e952667eddc4.tar.xz kernel-qcow2-linux-4c0dba447ef4a97dfbae6e876312e952667eddc4.zip | |
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>
Diffstat (limited to 'drivers/mtd/spi-nor/spi-nor.c')
| -rw-r--r-- | drivers/mtd/spi-nor/spi-nor.c | 12 |
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); |