From 1f5dd4700a588f389f074491e2b7710e53df66e3 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 9 Jul 2015 22:11:49 +0900 Subject: [PATCH] dm: do not set DM_FLAG_ACTIVATED twice Currently, DM_FLAG_ACTIVATED is set twice; before calling uclass_pre_probe_device() and again before calling drv->probe(). It looks like Simon's intention is the first one. The DM_FLAG_ACTIVATED was moved twice, by commit 02eeb1bbb174 (dm: core: Mark device as active before calling its probe() method), and then by commit 206d4d2b4b30 (dm: core: Mark device as active before calling uclass probe() methods). The first marking was added by the last move. Signed-off-by: Masahiro Yamada Acked-by: Simon Glass --- drivers/core/device.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/core/device.c b/drivers/core/device.c index 456426a957..03cd964b80 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -284,7 +284,6 @@ int device_probe_child(struct udevice *dev, void *parent_priv) goto fail; } - dev->flags |= DM_FLAG_ACTIVATED; if (drv->probe) { ret = drv->probe(dev); if (ret) { -- 2.25.1