summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2009-09-18 12:51:42 -0700
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-09-19 10:56:53 -0700
commit2eaaa5ff87c675aacd3a869fc5fe75a35bbd5278 (patch)
tree5224bbf24266e1025e08a109b493f932a2dac7bd /drivers/mtd
parentec77e21b91f0393a5201cfd4571a82ab7d64fd29 (diff)
downloadop-kernel-dev-2eaaa5ff87c675aacd3a869fc5fe75a35bbd5278.zip
op-kernel-dev-2eaaa5ff87c675aacd3a869fc5fe75a35bbd5278.tar.gz
mtd: sst25l, fix lock imbalance
Add an omitted unlock to one sst25l_erase fail path. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/devices/sst25l.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c
index ac7d52b..c2baf33 100644
--- a/drivers/mtd/devices/sst25l.c
+++ b/drivers/mtd/devices/sst25l.c
@@ -180,8 +180,10 @@ static int sst25l_erase(struct mtd_info *mtd, struct erase_info *instr)
mutex_lock(&flash->lock);
err = sst25l_wait_till_ready(flash);
- if (err)
+ if (err) {
+ mutex_unlock(&flash->lock);
return err;
+ }
while (addr < end) {
err = sst25l_erase_sector(flash, addr);
OpenPOWER on IntegriCloud