From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A573C282C3 for ; Thu, 24 Jan 2019 14:47:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3127F218AE for ; Thu, 24 Jan 2019 14:47:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548341230; bh=iZclcKa5g26Pl2zoG6lTC0ltR2bbVGtV5aWhI6L6zFs=; h=From:To:Cc:Subject:Date:List-ID:From; b=cMGw8CGQ5fTLYvaTQO8jObkp+UKCDFatE+gUrhhD37m5NNLrcyF3MYUedV/QnmEEW jdHvoNzyiuXiFQPImpNqPAANzmcBPbRAm7nvDRM+OhOaFtM4j/ZKg2UFdiI/CPDOzv 2Sfnpo8qMrBrNzBljd8tym04Kl/yNPVNucTp5l9s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728167AbfAXOrJ (ORCPT ); Thu, 24 Jan 2019 09:47:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:57386 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728030AbfAXOrJ (ORCPT ); Thu, 24 Jan 2019 09:47:09 -0500 Received: from localhost.localdomain (91-160-177-164.subs.proxad.net [91.160.177.164]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 46025218A2; Thu, 24 Jan 2019 14:47:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548341229; bh=iZclcKa5g26Pl2zoG6lTC0ltR2bbVGtV5aWhI6L6zFs=; h=From:To:Cc:Subject:Date:From; b=LWucNY3z94QNy2bDe7Z6agOazQykBrZEGOX7MMtG8KWMbFMZdhirTiHQoP5+YcHs4 j1muKTvejYLNW1ZKpWF4mGw0NG7O812V2n1wiTkrO6ltoNIdeuI1NrTiRuPB5MGi2h UsXapy+RO61FtFOgW7qe+hc7y3agJkN0dJ5lRWIU= From: Boris Brezillon To: Boris Brezillon , Richard Weinberger , Miquel Raynal , linux-mtd@lists.infradead.org Cc: David Woodhouse , Brian Norris , Marek Vasut , stable@vger.kernel.org Subject: [PATCH] mtd: spinand: Fix the error/cleanup path in spinand_init() Date: Thu, 24 Jan 2019 15:46:54 +0100 Message-Id: <20190124144654.27626-1-bbrezillon@kernel.org> X-Mailer: git-send-email 2.17.1 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The manufacturer specific initialization has already been done when block unlocking takes place, and if anything goes wrong during this procedure we should call spinand_manufacturer_cleanup(). Fixes: 7529df465248 ("mtd: nand: Add core infrastructure to support SPI NANDs") Cc: Signed-off-by: Boris Brezillon --- drivers/mtd/nand/spi/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c index 8bf37da19663..fa87ae28cdfe 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -1016,11 +1016,11 @@ static int spinand_init(struct spinand_device *spinand) for (i = 0; i < nand->memorg.ntargets; i++) { ret = spinand_select_target(spinand, i); if (ret) - goto err_free_bufs; + goto err_manuf_cleanup; ret = spinand_lock_block(spinand, BL_ALL_UNLOCKED); if (ret) - goto err_free_bufs; + goto err_manuf_cleanup; } ret = nanddev_init(nand, &spinand_ops, THIS_MODULE); -- 2.17.1