]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
dm: do not set DM_FLAG_ACTIVATED twice
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Thu, 9 Jul 2015 13:11:49 +0000 (22:11 +0900)
committerLothar Waßmann <LW@KARO-electronics.de>
Wed, 9 Sep 2015 11:48:56 +0000 (13:48 +0200)
commit79af5982bfa96e69f6cc6bc8d76f7602b0b73df7
treef94f562db56ae5fe14fdde9840a5e6ee6c9d579b
parentc4254da4a10e1765bb7426d02b2e908eca59c360
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>
drivers/core/device.c