summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <[email protected]>2019-02-01 16:01:07 +0100
committerTom Rini <[email protected]>2019-02-09 07:51:00 -0500
commitf3885649657b4dfb669ae4505a0516c3affb8694 (patch)
tree5505a39da34f193155977a5d907e4148ce627ea9
parenta765adc08f624dc229a83ac0c81f61af2d33246a (diff)
dm: device: fail uclass_find_first_device() if list_empty
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 <[email protected]> Reviewed-by: Simon Glass <[email protected]>
-rw-r--r--drivers/core/uclass.c2
-rw-r--r--test/dm/core.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index a622f079410..fc3157de39c 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 260f6494a2e..edd55b05d6e 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);