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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 72612C282C2 for ; Wed, 13 Feb 2019 18:45:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3DFF5222D5 for ; Wed, 13 Feb 2019 18:45:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550083506; bh=ICKdlv495ptx260aR/8JVAvkdq8KMT3PF6NdpaxpXMQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fr7s+jH25IBl3BxfReimxzrRe0zcdc0N1nNH1bBeP4/eYoHUHjoB5VwsXwfv7i2O1 6fNTFgZU51T14rjY5EJCoUsP8KyawkKs5iKKjh3yITH6lqDAof9/D7qourSmgJT3ui R7vnDZmqJyJsWS6RhbLpLr919oJw/ahcrFyemCYg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394043AbfBMSpE (ORCPT ); Wed, 13 Feb 2019 13:45:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:43754 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394028AbfBMSpE (ORCPT ); Wed, 13 Feb 2019 13:45:04 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E5955222D4; Wed, 13 Feb 2019 18:45:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550083503; bh=ICKdlv495ptx260aR/8JVAvkdq8KMT3PF6NdpaxpXMQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IlXNmlxSNslNc4QfgzAPuUE2c2A/Kd8skI6MFqQ2wClUS9ezUA4TyhL87tFD7Ho82 UEVU3xWpwxVJF4632SfS6st2O2mtI1vjJPl8n3eEVGONtDkmDDdvHQc7IaZlI5qrp6 kIJih7IpVBcYuj6LaQATvorfdfOIaHFmqaNunrRc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Boris Brezillon , Miquel Raynal Subject: [PATCH 4.20 03/50] mtd: spinand: Fix the error/cleanup path in spinand_init() Date: Wed, 13 Feb 2019 19:38:08 +0100 Message-Id: <20190213183656.040600586@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190213183655.747168774@linuxfoundation.org> References: <20190213183655.747168774@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Boris Brezillon commit c3c7dbf4887ab3ed9d611cd1f6e16937f8700743 upstream. 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 Acked-by: Miquel Raynal Signed-off-by: Greg Kroah-Hartman --- drivers/mtd/nand/spi/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -1014,11 +1014,11 @@ static int spinand_init(struct spinand_d 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);