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 D35B0C07EBB for ; Tue, 5 Oct 2021 13:56:52 +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 24B8161B29 for ; Tue, 5 Oct 2021 13:56:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 24B8161B29 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 D763C83138; Tue, 5 Oct 2021 15:56:37 +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="KFgfTyoR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7033582D1C; Tue, 5 Oct 2021 15:56:33 +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 7A23183176 for ; Tue, 5 Oct 2021 15:56:22 +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 4792461A35; Tue, 5 Oct 2021 13:56:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1633442181; bh=Oo+CDeE2nVnLadbmmug2uVKq6gTxDvhdWvF+rplZji8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KFgfTyoRDCDW9O1yJrUEhH2QvRx7dbNctEkh5I/kJIigSqdcsFcSW6psCstI1FR2I efLqPkYCZSakE+L1Cdk4eIXciROZ5j6ESnEuHqQivgH/wyR2r/wTAAUwE2gaBlK5+M QCXaXEkVU+7gitGdJo7I2OBhz+kgBH6tIpzI4wGH8OnJLA0SXo34aHuK/jQj1+fkbW FzkZ/xr3o/iKb2SINFW03xXwnF+9E/9OfChC/BIkSJ8MTNDdm2iGI0CA5ErcikivQ/ Q5a3gqCCAd5ySE3rw9hBw033BNKzsdtfHJ7LkTQRAggilmlf0GG1Dof82HTVxMb7gf FuNiRWbpsbWtQ== 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 04/10] mtd: spi-nor-core: Check return value of write_disable() in spi_nor_erase() Date: Tue, 5 Oct 2021 15:56:00 +0200 Message-Id: <20211005135606.2246-5-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 The cleanup code of spi_nor_erase() function calls write_disable(), but does not return it's return value even in case of failure. Fix this. Signed-off-by: Marek Behún Reviewed-by: Simon Glass Tested-by: Masami Hiramatsu --- drivers/mtd/spi/spi-nor-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index a6007acd1a..d49f7faf99 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -953,7 +953,9 @@ erase_err: if (!ret) ret = err; #endif - write_disable(nor); + err = write_disable(nor); + if (!ret) + ret = err; return ret; } -- 2.32.0