From 24c3fded8ab0b67cb6be63d07e1fd9824a5b526e Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 29 Dec 2019 21:19:16 -0700 Subject: [PATCH] dm: core: Don't clear active flag twice when probe() fails Remove this duplicated code, since the 'fail' label does this immediately. Change-Id: I445b8fc692343e071af7416989483ee39c1db94b Signed-off-by: Simon Glass --- drivers/core/device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/core/device.c b/drivers/core/device.c index b46af87253..88f26b343f 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -423,10 +423,8 @@ int device_probe(struct udevice *dev) if (drv->probe) { ret = drv->probe(dev); - if (ret) { - dev->flags &= ~DM_FLAG_ACTIVATED; + if (ret) goto fail; - } } ret = uclass_post_probe_device(dev); -- 2.34.1