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 0086EC433EF for ; Sat, 25 Sep 2021 17:34:25 +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 416556108E for ; Sat, 25 Sep 2021 17:34:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 416556108E 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 BAC0A835A5; Sat, 25 Sep 2021 19:34:12 +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="Ph4SkGoF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4C9B983591; Sat, 25 Sep 2021 19:33:43 +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 39CD883597 for ; Sat, 25 Sep 2021 19:33:33 +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 2D02D61076; Sat, 25 Sep 2021 17:33:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632591211; bh=iiiMKGRiIZAMYGTwX/Ldpf2+gDxMv65Lc4grjF0PIPs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ph4SkGoFuSzpDcg4wHBakRvAJxc8l4iKRgpJsPwO9+G9G3Wspz+ZHLrW6l7il0KhB S5gBmd/w29q2r+72Q/4kQu70bknel4sNFt4MMvACp1MFNWuctI3gkrFaCcSK07qBqh Uo4eZ/PLom15m3rxzpu+YFscYRFhjA9MH5DRjef1Y3B7645QjoAXIhIXnRRc+v5gNv HulQ1NtZR+Znkh4giZmqz/H7FO5vRc9+1FrLt99zUaFPFGvrlAaYX77X2DZ/CrLV/X 01W0cEnLLsSqFeBm7sqIJR/AwvtkJt/MbsuUWgzv8dEBqEnZff11xlc4g9cpPyMhgV q15CHO7M5RHJw== 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 , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Simon Glass , Masami Hiramatsu Subject: [PATCH u-boot-spi v2 4/9] mtd: spi-nor-core: Check return value of write_disable() in spi_nor_erase() Date: Sat, 25 Sep 2021 19:33:13 +0200 Message-Id: <20210925173318.25804-5-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210925173318.25804-1-kabel@kernel.org> References: <20210925173318.25804-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 30c0afc08c..9e936cbe1a 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -951,7 +951,9 @@ erase_err: if (!ret) ret = err; #endif - write_disable(nor); + err = write_disable(nor); + if (!ret) + ret = err; return ret; } -- 2.32.0