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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 548D6C433F5 for ; Tue, 5 Oct 2021 13:56:39 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B1C99610EA for ; Tue, 5 Oct 2021 13:56:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B1C99610EA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 616C3831DB; Tue, 5 Oct 2021 15:56:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="pxjEEHIq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C2A9A82B45; Tue, 5 Oct 2021 15:56:23 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id ADE778203C for ; Tue, 5 Oct 2021 15:56:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=kabel@kernel.org Received: by mail.kernel.org (Postfix) with ESMTPSA id 6CBF661A10; Tue, 5 Oct 2021 13:56:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1633442174; bh=UOjqLiWeYzPNjJ60nTo1EJeUSknuU/PbthehCMommS4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pxjEEHIqRSmy4tt+WwOeo00Q0g2GTYRk3E4yLjM8HM6TNOuSV31YrXI89ZVTfX+gO HZCVl7Za34zR4Otezcra4oOhXF0ofshHX1EP7X1TZUOxSTj4kerM+WiBXv14PKwLOL KhzYZ5VkbDbJkU2OV4BYSuYo5MeaPLxCvkBcD5BkppYlsX5bjZ1wn0zg1Tv07Fvdu+ u+EsBVc4rsh2X0q9hftq7NA+8rYYVjy5p7BGirxsLdrmzqlsmfM7qQsU1rzmd0Xb1w cTjfTSdz/2Uj30dTkmoQtXrph/I2fU38AvVL5jxbnlXGeY7IoVYDLhByJ0hi9MI1xW dBWcatqWJ4WsA== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Jagan Teki , Tom Rini Cc: u-boot@lists.denx.de, Patrick Delaunay , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Patrice Chotard , Marek Vasut , Pratyush Yadav , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Simon Glass , Masami Hiramatsu Subject: [PATCH u-boot-spi v3 01/10] mtd: spi-nor-core: Try cleaning up in case writing BAR failed Date: Tue, 5 Oct 2021 15:55:57 +0200 Message-Id: <20211005135606.2246-2-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211005135606.2246-1-kabel@kernel.org> References: <20211005135606.2246-1-kabel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean From: Marek Behún Use the cleanup codepath of spi_nor_erase() also in the event of failure of writing the BAR register. Signed-off-by: Marek Behún Reviewed-by: Simon Glass Reviewed-by: Jagan Teki Reviewed-by: Pratyush Yadav Tested-by: Masami Hiramatsu --- drivers/mtd/spi/spi-nor-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index f1b4e5ea8e..d1e2bb47f7 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -929,7 +929,7 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr) #ifdef CONFIG_SPI_FLASH_BAR ret = write_bar(nor, addr); if (ret < 0) - return ret; + goto erase_err; #endif write_enable(nor); -- 2.32.0