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);