[PATCH 07/19] dm: core: Don't clear active flag twice when probe() fails

Simon Glass sjg at chromium.org
Mon Dec 30 05:19:16 CET 2019


Remove this duplicated code, since the 'fail' label does this immediately.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 drivers/core/device.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/core/device.c b/drivers/core/device.c
index 4e037083a6..2442b5834d 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -431,10 +431,8 @@ int device_probe(struct udevice *dev)
 
 	if (drv->probe) {
 		ret = drv->probe(dev);
-		if (ret) {
-			dev->flags &= ~DM_FLAG_ACTIVATED;
+		if (ret)
 			goto fail;
-		}
 	}
 
 	ret = uclass_post_probe_device(dev);
-- 
2.24.1.735.g03f4e72817-goog



More information about the U-Boot mailing list