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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS 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 95486C282C0 for ; Fri, 25 Jan 2019 11:08:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 62A2B2184B for ; Fri, 25 Jan 2019 11:08:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726049AbfAYLIE convert rfc822-to-8bit (ORCPT ); Fri, 25 Jan 2019 06:08:04 -0500 Received: from mail.bootlin.com ([62.4.15.54]:47138 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725909AbfAYLID (ORCPT ); Fri, 25 Jan 2019 06:08:03 -0500 Received: by mail.bootlin.com (Postfix, from userid 110) id 9C30D20712; Fri, 25 Jan 2019 12:08:01 +0100 (CET) Received: from xps13 (aaubervilliers-681-1-87-206.w90-88.abo.wanadoo.fr [90.88.29.206]) by mail.bootlin.com (Postfix) with ESMTPSA id 5D24420746; Fri, 25 Jan 2019 12:07:51 +0100 (CET) Date: Fri, 25 Jan 2019 12:07:51 +0100 From: Miquel Raynal To: Boris Brezillon Cc: Richard Weinberger , linux-mtd@lists.infradead.org, David Woodhouse , Brian Norris , Marek Vasut , stable@vger.kernel.org Subject: Re: [PATCH] mtd: spinand: Fix the error/cleanup path in spinand_init() Message-ID: <20190125120751.3a66715e@xps13> In-Reply-To: <20190124144654.27626-1-bbrezillon@kernel.org> References: <20190124144654.27626-1-bbrezillon@kernel.org> Organization: Bootlin X-Mailer: Claws Mail 3.17.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) 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 Hi Boris, Boris Brezillon wrote on Thu, 24 Jan 2019 15:46:54 +0100: > 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); Acked-by: Miquel Raynal Thanks, Miquèl