From 206d4d2b4b30889678bb6b064002013a427b1501 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 25 Mar 2015 12:21:56 -0600 Subject: dm: core: Mark device as active before calling uclass probe() methods The uclass pre-probe functions may end up calling back into the device in some circumstances. This can fail if recursion takes place. Adjust the ordering so that we mark the device as active early, then retract this later if needed. Signed-off-by: Simon Glass Reviewed-by: Marek Vasut --- test/dm/test-uclass.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c index be91657..7cb37f7 100644 --- a/test/dm/test-uclass.c +++ b/test/dm/test-uclass.c @@ -31,6 +31,7 @@ int test_ping(struct udevice *dev, int pingval, int *pingret) static int test_post_bind(struct udevice *dev) { dm_testdrv_op_count[DM_TEST_OP_POST_BIND]++; + ut_assert(!device_active(dev)); return 0; } @@ -48,7 +49,7 @@ static int test_pre_probe(struct udevice *dev) dm_testdrv_op_count[DM_TEST_OP_PRE_PROBE]++; ut_assert(priv); - ut_assert(!device_active(dev)); + ut_assert(device_active(dev)); return 0; } -- cgit v1.1