From ca04371948ce8ac22fd42f57eb9f1814f7a94175 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Fri, 18 Sep 2009 12:51:42 -0700
Subject: [PATCH] --- yaml --- r: 165457 b: refs/heads/master c:
 2eaaa5ff87c675aacd3a869fc5fe75a35bbd5278 h: refs/heads/master i:   165455:
 a3b6d1bff1cb2e9e409b5bc0c7545c7db7295baf v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/mtd/devices/sst25l.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index adc2f492554a..3368715eb0c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec77e21b91f0393a5201cfd4571a82ab7d64fd29
+refs/heads/master: 2eaaa5ff87c675aacd3a869fc5fe75a35bbd5278
diff --git a/trunk/drivers/mtd/devices/sst25l.c b/trunk/drivers/mtd/devices/sst25l.c
index ac7d52b420cc..c2baf3353f84 100644
--- a/trunk/drivers/mtd/devices/sst25l.c
+++ b/trunk/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);