From patchwork Fri Feb 1 15:01:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1034805 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=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43rgLH5ZsVz9s4V for ; Sat, 2 Feb 2019 02:01:59 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 737F2C21D9A; Fri, 1 Feb 2019 15:01:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2DE27C21D8E; Fri, 1 Feb 2019 15:01:24 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B2302C21C27; Fri, 1 Feb 2019 15:01:22 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 038B1C21C2C for ; Fri, 1 Feb 2019 15:01:21 +0000 (UTC) Received: from localhost.localdomain ([81.221.68.199]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M7Imm-1h2HPO0Jy2-00wzd5; Fri, 01 Feb 2019 16:01:16 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 1 Feb 2019 16:01:07 +0100 Message-Id: <20190201150109.4450-2-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190201150109.4450-1-marcel@ziswiler.com> References: <20190201150109.4450-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:2bIx0YRodTXGTGeUfGpHg/erZvj1z/WhW2He9XtQQUKZ51Mfisc 1pSfK3D6jgtmr2Xo29TRcfrVSfpaRcd93omV06pIC7w8BkBpUZk9jK29yTG9ZX4ZNBBQsvj Rpl6dKk9mEJrv6kkT99n5KZt8Y43jwLIKfE6r0wYdSjCWldX3XPq5fBlCSpR90RlZqKyHa7 G2zpwjT5GneycyalcJ8kA== X-UI-Out-Filterresults: notjunk:1; V03:K0:gitz/43buyc=:RyP/poOiUXtqVZF2bHIlSP u8xwSxWXjy4Di4pQCyEqCJy42wiP/KYPOyYDIa3KGd74kyAoifOMb/2MgNKfNofq/eVsdtxhJ pzf8hX4zKPoYWdDVHlI+HfRooQisZO7itYDk8tcificxMrZKHHfqvQ08WmjTCazdLPCTdha12 YYVL7i2EnGIrj603jOLgkj5aRZQou1GfiwD1xqwfcOtw+xkmco7G9bFc/51VZslpWE1N0qKwY tUyDg6aYOW9/tZLlXCPAXEIbruo9aJXvcJXBF5sotJkcFtnR8aB6xQHIsmxgjmJXdq7kjrvmc ED9BXU3QcUanpJHwlj0pvSAEHJ4WNvjK0+M/L4e4otsntftZy1oom+ICRPG/15N3D5cm3Dd// yDSZL0nGI2E3/K08wu4CqlhCLYmrmBnD8MDXau+uknA+r0eo/BUjOFzIpMfpsHSwlmz/B21Cj qYDFb+iPZ2GfJkpqdUVf0KMOjV5IPlDt1hODI3bc1pxfGZviJ3bf0+GFXcaD/0xsLqucvUfT7 fkJm+MqmRarzIXh6MD9+jFM+svypIWctyGcb8nRI8y0vvQXbeevNpAkRGMkhl+/Z4Q60c+ibd PGTbtPl4yLMv/rDrYfrO2yHiDlzclYrE+1t/NZjE21aW4785n4qzo+7aIAc++GTB32mLMCVP6 A7DntGA13ANO1joarjkcMNUdcWQziIstFy3ZCilpDYwlTfRDlDdOMEYFrGZxFQWBSEEmT+EeT WCQhW8anPiLHE5tx3NmREBNplt8pgz/vmL1ueA== Cc: Marcel Ziswiler Subject: [U-Boot] [PATCH v3 1/2] dm: device: fail uclass_find_first_device() if list_empty X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" From: Marcel Ziswiler While uclass_find_device() fails with -ENODEV in case of list_empty strangely uclass_find_first_device() returns 0. Fix uclass_find_first_device() to also fail with -ENODEV instead. Signed-off-by: Marcel Ziswiler Reviewed-by: Simon Glass --- Changes in v3: - Added Simon's reviewed-by. Changes in v2: - Update dm_test_uclass_devices_find() to test this behaviour as suggested by Simon. drivers/core/uclass.c | 2 +- test/dm/core.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index a622f07941..fc3157de39 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -225,7 +225,7 @@ int uclass_find_first_device(enum uclass_id id, struct udevice **devp) if (ret) return ret; if (list_empty(&uc->dev_head)) - return 0; + return -ENODEV; *devp = list_first_entry(&uc->dev_head, struct udevice, uclass_node); diff --git a/test/dm/core.c b/test/dm/core.c index 260f6494a2..edd55b05d6 100644 --- a/test/dm/core.c +++ b/test/dm/core.c @@ -749,6 +749,10 @@ static int dm_test_uclass_devices_find(struct unit_test_state *uts) ut_assert(dev); } + ret = uclass_find_first_device(UCLASS_TEST_DUMMY, &dev); + ut_assert(ret == -ENODEV); + ut_assert(!dev); + return 0; } DM_TEST(dm_test_uclass_devices_find, DM_TESTF_SCAN_PDATA); From patchwork Fri Feb 1 15:01:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1034806 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=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43rgLs6y3vz9sDX for ; Sat, 2 Feb 2019 02:02:29 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A06D6C21DEC; Fri, 1 Feb 2019 15:01:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id AAD7DC21DF9; Fri, 1 Feb 2019 15:01:25 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E6863C21D83; Fri, 1 Feb 2019 15:01:23 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 30626C21C27 for ; Fri, 1 Feb 2019 15:01:23 +0000 (UTC) Received: from localhost.localdomain ([81.221.68.199]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LmM7w-1hPT6F32N0-00Zz83; Fri, 01 Feb 2019 16:01:18 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 1 Feb 2019 16:01:08 +0100 Message-Id: <20190201150109.4450-3-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190201150109.4450-1-marcel@ziswiler.com> References: <20190201150109.4450-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:ngbQ7q/SBUxwfsYYPNWpM1L6HhYFLVK5HGMY8gcTb0L0S9AxXGv oi94mPSz2jIsryKRAGebL+6shExC0/sc8W+kTOhmXKI14FGvo9wjseGtl0ShRIpRRwQFyBt zvPIpcIauD7Z+kXR0ccHQsPIIvACC6qDxT9zmKKKD4Lsosl2WS0pdERcHe3l3WamtlLnl7Y yEPjs5A8jKtLmGDoABNug== X-UI-Out-Filterresults: notjunk:1; V03:K0:PuYXIDTozF8=:/x+yvokcswQYpb8QiwMc9g zAIsPahCC1Q3mg8WpB84vFpanSaTPXJ9EkNWvvjm40UF/Z577i/8CGF1fltPIu8KT83/A4cgz jjBjtcMv1ooY7FYrVYPaupW2nmMcdXiAKm1mT3eaT3QwImEV1tCSyFjfLHatWPPxYePfCZdDd 9v9G6wkzW1B7nG6vllAqCgEUx8jFimXZNE9FQJnFgpwx7e6cJe634J1oMbpEuwVi30m3bQI3u CEW54yTZRerKAtBD3fcwvlGsK5uk1fni8PT062wXTg6omWlmujBLZ+M2sgRReXgNJnDSy1YXg xbsV1kUdKG5O7bXZG0OnsmoDiGCj+9oCl5wHeAtPma6yJTQQCxf+toToAP7dHvUmfJ2JhTEiD kSgCdjSWKtNfyuQRthRbBuE4mcCjXhxU2W92Zhh3okIcnLEghmHKRQdFyq8frD8tv9IdV7Lmx ejw62wZq/QzFNZ+DnGCbhQYT4Z1muDLK9D2btBox+xwNxL6pqKjScS1RHC6h9WVz9ArVQV8iY npx5nX3ugGfoXZsxkyzFKeKEZ4O5sgUsfRcM/5E/kXiqAtUBgXxNY9wFfWZfggcClzNFpKUy2 9NizfdJga/xJuHG/l0RYiEq0UW7HJXVeA3JYI+Mgb9B6uHyYl5SC9Ndo1waaJ4Qc3Yer/ffKp 1KP5Qrqu8YyL2wWEOEDhWHDAXPJPhpbfkb13SE3gectOyJDR6zZ6YvrHJRbQVKi+fceP0Wwtc TAElfXSCIifmFY39DvcrNVrbeIYPA6daUuJVfg== Cc: Marcel Ziswiler , Tom Rini Subject: [U-Boot] [PATCH v3 2/2] cmd: sata: add null pointer check for dev X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" From: Marcel Ziswiler Calling sata_scan() with a null pointer probably won't make much sense. Signed-off-by: Marcel Ziswiler Reviewed-by: Simon Glass --- Changes in v3: None Changes in v2: - Dropped "[PATCH 2/3] dm: sata: add null pointer check for dev" as suggested by Simon. - Added Simon's reviewed-by. cmd/sata.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/sata.c b/cmd/sata.c index 6d62ba8f74..a73cc54bd3 100644 --- a/cmd/sata.c +++ b/cmd/sata.c @@ -60,6 +60,10 @@ int sata_probe(int devnum) printf("Cannot probe SATA device %d (err=%d)\n", devnum, rc); return CMD_RET_FAILURE; } + if (!dev) { + printf("No SATA device found!\n"); + return CMD_RET_FAILURE; + } rc = sata_scan(dev); if (rc) { printf("Cannot scan SATA device %d (err=%d)\n", devnum, rc);