Commit 1f5dd470 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Simon Glass
Browse files

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 02eeb1bb
(dm: core: Mark device as active before calling its probe()
method), and then by commit 206d4d2b

 (dm: core: Mark device
as active before calling uclass probe() methods).
The first marking was added by the last move.
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarSimon Glass <sjg@chromium.org>
parent 643e6902
...@@ -284,7 +284,6 @@ int device_probe_child(struct udevice *dev, void *parent_priv) ...@@ -284,7 +284,6 @@ int device_probe_child(struct udevice *dev, void *parent_priv)
goto fail; goto fail;
} }
dev->flags |= DM_FLAG_ACTIVATED;
if (drv->probe) { if (drv->probe) {
ret = drv->probe(dev); ret = drv->probe(dev);
if (ret) { if (ret) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment