| commit | 9046dec29552d4a5fedd1ac00123d761c09b0291 | [log] [tgz] |
|---|---|---|
| author | Simon Glass <sjg@chromium.org> | Sun Dec 29 21:19:16 2019 -0700 |
| committer | Simon Glass <sjg@chromium.org> | Tue Jan 07 16:02:38 2020 -0700 |
| tree | f983c44db2e47a972048878e2ef9b027865c17d6 | |
| parent | 7d7c70421052dcad006aa5d0eb9b9cc6ba2a7bdc [diff] [blame] |
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 <sjg@chromium.org>
diff --git a/drivers/core/device.c b/drivers/core/device.c index 4e03708..2442b58 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c
@@ -431,10 +431,8 @@ if (drv->probe) { ret = drv->probe(dev); - if (ret) { - dev->flags &= ~DM_FLAG_ACTIVATED; + if (ret) goto fail; - } } ret = uclass_post_probe_device(dev);