Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp584323imm; Wed, 4 Jul 2018 02:23:00 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe5tRaq148qD+FXSvLAQ4SLSpX/0ea6nyhQZlobFcSkW36e6aWxBhw2KKzmePmj5DIDOeMn X-Received: by 2002:a17:902:68:: with SMTP id 95-v6mr1335809pla.178.1530696180731; Wed, 04 Jul 2018 02:23:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530696180; cv=none; d=google.com; s=arc-20160816; b=r5vL31Q/DqgXlepLx5vQHAb1XuG2UKNvuOzKt/QibdiPjc5Ovofen5PfVu/ZBaw8XY GkyTwvBjK4X523V7EIuF+DxrHYaIYTEMv1H0MqN8QcI3UTyegTzTWPvwsb+ns4By26Zn BHzcGhlSDFYePXpLMRK9ml0fsxjXagUGfETlqyIAXlCTAzNZKMxsS9sMQU9KLEXHxnmj vEdBPFFeg5V2kid8vk5+H/hjHRqWPrRqU7njnfcQmLqES/W+m2BoytjzdkOjnQLvXg2/ g/mtvQ8J1bcpHBo4NBr64RIBmaVyTJDVWLqX4rKo+1xzWP2ghsd3JYBw5dfclDJgyRA4 JQQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=v3oJulIguQLypbdru4R8YzvXaOnZqisP3qBL/fnUO/Q=; b=paR6BlAyGsC/FgPPweRB910sXYBbprcjdIJBmjYpsHCdhI4AiAlU07U+1z7AcurjYj HTfhe2LsMSdzbOggxFmJuFBf1ot/d24lyFUvisaKtXWr2/5uGO5ld65/sjtB1FA0FkfW IjoXFX01tXQlvF8rjXw4zrrPt6046THRN0JScXlF7Rcs42/VzuKFRiA80Y1D15ZUs9NM hBVK3j4mufeezAxWopCcVY1AZ09wzp7Dga90cmYfQSlKAxTuf3TbNXxjGbX1LChe3L7s rkXiXklVIiblEJCR0JDCPueZKppcAzq74DfjK65bIE8mikZf7oqO32mzYuI6M8qWUe1m 8xsA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 185-v6si2885963pgj.511.2018.07.04.02.22.46; Wed, 04 Jul 2018 02:23:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934482AbeGDJVZ (ORCPT + 99 others); Wed, 4 Jul 2018 05:21:25 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:42988 "EHLO huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752814AbeGDJVV (ORCPT ); Wed, 4 Jul 2018 05:21:21 -0400 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id F2A9B3C49AC3D; Wed, 4 Jul 2018 17:21:16 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.382.0; Wed, 4 Jul 2018 17:21:09 +0800 From: Wei Yongjun To: Boris Brezillon , Miquel Raynal , Richard Weinberger , "David Woodhouse" , Brian Norris , Marek Vasut , Frieder Schrempf CC: Wei Yongjun , , , Subject: [PATCH -next v3] mtd: spinand: fix missing unlock on error Date: Wed, 4 Jul 2018 09:30:27 +0000 Message-ID: <1530696627-84879-1-git-send-email-weiyongjun1@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1530696061-76467-1-git-send-email-weiyongjun1@huawei.com> References: <1530696061-76467-1-git-send-email-weiyongjun1@huawei.com> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add the missing unlock before return from function spinand_mtd_(read|write) in the error handling case. Fixes: c898e0526fb6 ("mtd: nand: Add core infrastructure to support SPI NANDs") Signed-off-by: Wei Yongjun --- v2 -> v3: remove blank line v1 -> v2: using break instead of return --- drivers/mtd/nand/spi/core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c index 17d207a..8998dca 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -561,11 +561,11 @@ static int spinand_mtd_read(struct mtd_info *mtd, loff_t from, nanddev_io_for_each_page(nand, from, ops, &iter) { ret = spinand_select_target(spinand, iter.req.pos.target); if (ret) - return ret; + break; ret = spinand_ecc_enable(spinand, enable_ecc); if (ret) - return ret; + break; ret = spinand_read_page(spinand, &iter.req, enable_ecc); if (ret < 0 && ret != -EBADMSG) @@ -609,11 +609,11 @@ static int spinand_mtd_write(struct mtd_info *mtd, loff_t to, nanddev_io_for_each_page(nand, to, ops, &iter) { ret = spinand_select_target(spinand, iter.req.pos.target); if (ret) - return ret; + break; ret = spinand_ecc_enable(spinand, enable_ecc); if (ret) - return ret; + break; ret = spinand_write_page(spinand, &iter.req); if (ret)