diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-07-09 22:11:49 +0900 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-07-21 17:39:34 -0600 |
| commit | 1f5dd4700a588f389f074491e2b7710e53df66e3 (patch) | |
| tree | 4ca361538f70dc7259af88c1a0463ce759ddfb5e /drivers/core | |
| parent | 643e69021ef921c6ea63da9fc274c0de5a3d0eed (diff) | |
| download | talos-obmc-uboot-1f5dd4700a588f389f074491e2b7710e53df66e3.tar.gz talos-obmc-uboot-1f5dd4700a588f389f074491e2b7710e53df66e3.zip | |
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 <yamada.masahiro@socionext.com>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/device.c | 1 |
1 files changed, 0 insertions, 1 deletions
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) { |
