Message ID | 20211005135606.2246-5-kabel@kernel.org |
---|---|
State | Accepted |
Commit | f57277997bd8036d45337ec60b08a025a0473f89 |
Delegated to: | Jagannadha Sutradharudu Teki |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=KFgfTyoR; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HNzfH5zvlz9sPf for <incoming@patchwork.ozlabs.org>; Wed, 6 Oct 2021 00:56:55 +1100 (AEDT) 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) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 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 <u-boot@lists.denx.de>; 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_Beh=C3=BAn?= <kabel@kernel.org> To: Jagan Teki <jagan@amarulasolutions.com>, Tom Rini <trini@konsulko.com> Cc: u-boot@lists.denx.de, Patrick Delaunay <patrick.delaunay@st.com>, =?utf-8?q?Pali_Roh=C3=A1r?= <pali@kernel.org>, Patrice Chotard <patrice.chotard@foss.st.com>, Marek Vasut <marex@denx.de>, Pratyush Yadav <p.yadav@ti.com>, =?utf-8?q?Marek_Beh=C3=BAn?= <marek.behun@nic.cz>, Simon Glass <sjg@chromium.org>, Masami Hiramatsu <masami.hiramatsu@linaro.org> 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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean |
Series |
Fix `mtd erase` when used with mtdpart
|
expand
|
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; }