From 7497812d47d4ad17172ec373469a33a6ab8b257e Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 23 Jul 2014 06:55:00 -0600 Subject: [PATCH] dm: Make sure that the root device is probed The root device should be probed just like any other device. The effect of this is to mark the device as activated, so that it can be removed (along with its children) if required. Signed-off-by: Simon Glass Acked-by: Marek Vasut --- drivers/core/root.c | 3 +++ test/dm/core.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/core/root.c b/drivers/core/root.c index 11e08796b2..ac1c1648f3 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -47,6 +47,9 @@ int dm_init(void) INIT_LIST_HEAD(&DM_UCLASS_ROOT_NON_CONST); ret = device_bind_by_name(NULL, &root_info, &DM_ROOT_NON_CONST); + if (ret) + return ret; + ret = device_probe(DM_ROOT_NON_CONST); if (ret) return ret; diff --git a/test/dm/core.c b/test/dm/core.c index be3646b968..8c187806ec 100644 --- a/test/dm/core.c +++ b/test/dm/core.c @@ -106,7 +106,7 @@ static int dm_test_autoprobe(struct dm_test_state *dms) ut_asserteq(0, dm_testdrv_op_count[DM_TEST_OP_POST_PROBE]); /* The root device should not be activated until needed */ - ut_assert(!(dms->root->flags & DM_FLAG_ACTIVATED)); + ut_assert(dms->root->flags & DM_FLAG_ACTIVATED); /* * We should be able to find the three test devices, and they should -- 2.25.1