From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Glass Date: Sun, 29 Dec 2019 21:19:16 -0700 Subject: [PATCH 07/19] dm: core: Don't clear active flag twice when probe() fails In-Reply-To: <20191230041928.74874-1-sjg@chromium.org> References: <20191230041928.74874-1-sjg@chromium.org> Message-ID: <20191229211913.7.Ieb0ef1a4772b83865f916307560a692dbafb1268@changeid> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Remove this duplicated code, since the 'fail' label does this immediately. Signed-off-by: Simon Glass --- 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