From a41e6daf0555b2461b3a3ae457bf9b9626e2d855 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. 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 4e037083a6..2442b5834d 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -431,10 +431,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.25.1