From patchwork Mon Jul 13 21:22:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 29750 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 1BFA4B7088 for ; Tue, 14 Jul 2009 07:31:55 +1000 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MQT4J-0008KL-9l; Mon, 13 Jul 2009 21:28:15 +0000 Received: from server1.wserver.cz ([82.113.45.157]) by bombadil.infradead.org with esmtps (Exim 4.69 #1 (Red Hat Linux)) id 1MQT49-0008GX-Q6 for linux-mtd@lists.infradead.org; Mon, 13 Jul 2009 21:28:12 +0000 Received: from localhost.localdomain (unknown [82.113.46.245]) by server1.wserver.cz (Postfix) with ESMTP id 1537FC478D; Mon, 13 Jul 2009 23:28:02 +0200 (CEST) From: Jiri Slaby To: dwmw2@infradead.org Subject: [PATCH] MTD: sst25l, fix lock imbalance Date: Mon, 13 Jul 2009 23:22:04 +0200 Message-Id: <1247520124-31875-1-git-send-email-jirislaby@gmail.com> X-Mailer: git-send-email 1.6.3.2 X-Spam-Score: 1.1 (+) X-Spam-Report: SpamAssassin version 3.2.5 on bombadil.infradead.org summary: Content analysis details: (1.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.1 RCVD_IN_SORBS_WEB RBL: SORBS: sender is a abuseable web server [82.113.46.245 listed in dnsbl.sorbs.net] Cc: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, Jiri Slaby X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Add an omitted unlock to one sst25l_erase fail path. Signed-off-by: Jiri Slaby --- drivers/mtd/devices/sst25l.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c index 1648685..5022ab2 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);