From patchwork Wed Jan 27 20:26:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1432338 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=bTyfwTSI; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 ozlabs.org (Postfix) with ESMTPS id 4DQwBF0Phbz9sS8 for ; Thu, 28 Jan 2021 07:27:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A773482779; Wed, 27 Jan 2021 21:26:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="bTyfwTSI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B22278277A; Wed, 27 Jan 2021 21:26:51 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 085F482778 for ; Wed, 27 Jan 2021 21:26:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1611779207; bh=YmV/Q8POWRrHWaR3KIXzJ6zDXCklfYRRbKlXfYxbNW4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=bTyfwTSIfL/YWEGc7rAIOaoJzfYJs09r6U2YFjmie36ktHWtvBTFsUXhSkDElX73w HPS4F1z8cvu9tVlsR32AHGsiudO4mSQczYsjpveBHwsMUChtm6iNRYKjAKgP2oyCcz /z/D0NQIFfpjyjHjjv51yVS/ksDliYWtXef/IWWw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([62.143.246.89]) by mail.gmx.net (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1M1Ycr-1l7KVY1QVf-0037sY; Wed, 27 Jan 2021 21:26:47 +0100 From: Heinrich Schuchardt To: Tom Rini Cc: Simon Glass , Joao Marcos Costa , Richard Genoud , Niel Fourie , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/1] cmd: load, emit error message for invalid block device Date: Wed, 27 Jan 2021 21:26:43 +0100 Message-Id: <20210127202643.91231-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:PvmToHa1idKH4/kbrL0Y0FG945bkfu5YQ3PruNWZipBbWMf794s iMn+jHokZYv2jlJkchHjsIaskJk752tFjruzHFHYVkgjsU9Z+Am+jfpuW02I2H3M4vEWEh8 93QCEsOU+pvV6KcJ9NMm7J9b3twpbVMoFVYaZnemkg8HmTDcPZ96ZIF4phmUkhCOU311X0n T+l/ss94sHVWwL8kgW4mw== X-UI-Out-Filterresults: notjunk:1;V03:K0:PUmpenLdBWI=:qD19oiseAuwRzuaJ5pbGWA cG4Go4uzU80YybBzgE7IU32sxfRumHqi1UTw1FyaMLZhs9wd8zoeHpVoNblcUHDpwMHHZmobW pPiJwnGG1APftKcv4iei/NWp8WPc4QJ2qBZc1ivlaUcJAow7J17S4wmBAfZFzph0OxgPUt93k NaomNIGmbLFmKOegrQKtZz1x5AT6D8lpws53UWeb4CCqWuYt00Qs7cfyvB9wsCr/ryPZpoqUc AxAi21/XMbkDIpmJUDfNQHCxRS2nKw47SsatCOb5H4YmHWIZBNACQY/8C7RoYO6xoe6+QzpnA /14LU+3WavfdjoFD/XIcT1UIvw7DeeDtBIf6TAFAup1kUzgg39ClcKn/KfZR86RJZVUxaIpOf /Si2lEBQzchHt+J2OQmm2mDigCQELMbVkGJLKkNcWU68IMq1/R7dSSx62quPDOQm/GujqHZ92 us1h9hSFqCsgGdRM6CmwDTcKZvqwTMrcdDRFM5Aez1fQsZc1ZU4baeB14ttw/GgaFUfr8VQaq eCGlMtNpSf+G1ORPwSm50r/DxGeBpBgabUUNlRgqikNsjCJo/jFjPn68qBXUzccyityCAruYA 5dG0cjjCRX0QzMlNc/TMzOyE58LxswTbhYDRYTETpG6PFIS6B28hpsjGQuuaCG6/ThfE0TVDv enfPTTBwEBCc/pISfN4EZrQ3YCSxHNcK9fI9wqncL2vVl9Rm0Z0NkDi1oGvccKJDMuTg+dQMX OOtsInkexpt1QCXBm4PQ7Ou7cvVeXxqDntzP/gUQ7KnnGS4htqmWVRQ+e04ar2PpalpI4cwdu ys5YymehBnP4mf+4rCLHFbO5gzM2UXLbh5hhXckJSg0xuvaq+FRL/a322HQovyffVcsnPsyXU fLaWmMHeb2lBReufNvKQ== 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.102.3 at phobos.denx.de X-Virus-Status: Clean The load command should not silently return to the console prompt if an invalid block device is specified and no file is loaded. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- fs/fs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.29.2 diff --git a/fs/fs.c b/fs/fs.c index 68a15553cc..0c8f577a79 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -710,8 +710,10 @@ int do_load(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], if (argc > 7) return CMD_RET_USAGE; - if (fs_set_blk_dev(argv[1], (argc >= 3) ? argv[2] : NULL, fstype)) + if (fs_set_blk_dev(argv[1], (argc >= 3) ? argv[2] : NULL, fstype)) { + log_err("Can't set block device\n"); return 1; + } if (argc >= 4) { addr = simple_strtoul(argv[3], &ep, 16);