From patchwork Thu Mar 11 02:02:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1450931 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=D8xdKSqj; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DwsgK68kMz9sVw for ; Thu, 11 Mar 2021 13:03:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 73367828E1; Thu, 11 Mar 2021 03:02:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="D8xdKSqj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 664A182890; Thu, 11 Mar 2021 03:02:38 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x82e.google.com (mail-qt1-x82e.google.com [IPv6:2607:f8b0:4864:20::82e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 616BF82893 for ; Thu, 11 Mar 2021 03:02:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qt1-x82e.google.com with SMTP id m7so55954qtq.11 for ; Wed, 10 Mar 2021 18:02:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QBeOQpa2j2+QYTqXiDpUkeg8z6q0ATnPQhma9mzmTw0=; b=D8xdKSqjHSg1JnUmEbuVeimje28nWudTRFrjtSzoDDidaMVpfJk81PPPErrHSGeYrv fLFKCBA4TBfqOFFUoB3d2o6GSdSVCJCc1D9yPZXG5g9t53ZYYWgawQt11dG8OhSh+xt6 iB7x+VXF8Jhn14MH1k6QO8NdqUz4de6M1psc/5TMJ2Mxg4A5fcSDUy1Qs1dOiUApmOih UIiFwCDfN4aTbqbxsnI6+4AFfUAd87jDRN5t2lAJygWzwKlRF/LUOnDGG7n2QOn89dAD BFJaNtlzL77gcmD41rc9Nz0+iiHRGa0B/e3531D4tQEk3m4KeC0Yv6O5kUvVhmxOuRQ3 cokg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QBeOQpa2j2+QYTqXiDpUkeg8z6q0ATnPQhma9mzmTw0=; b=eXAfE7K/XJiEvpsV+pxV4BNAaYrdW1LQfP93ThXWwleU7Lp771Uui2cgIozCLMtHnK tziIeP7vtFgt9x14p6DMeX7bk52A44bXyG9COeqnJSIogu+Q0NfW9SMQ61bJ0Rr22azX /XEYgl/qdlcK64pp+7NtmAFybn1qxm+AG6trKW5tP6mB62XMd3YfILR3dFfG5tSJfhx0 2SCqalXGSyTV5UBlvF0z4ccXUT64x4Vb6F+ND8j+HJpktBzyJSbGbXEtETQk+EjXqSNg UnxkSfUYjd/ireG0ec49xDYpaxYKytRiibsAdvpqwc1ndh9ZiDBmEARquUNuvJTbW6qv nrhw== X-Gm-Message-State: AOAM531WgYFjJSlMD8GVbLaLGK8bvPyrRNEZdrhVlCwb9aZ87ROCbHUC ZHkAg3scWNoVJmrokAKSSluTWr9jc4o= X-Google-Smtp-Source: ABdhPJwzD7T6rB+IciY0vLrITNiS+8DLe/F9e3MdG7mIrEZHwAA7deYJ7AFcTZk5ZUYeSSUPFCdTxw== X-Received: by 2002:ac8:7089:: with SMTP id y9mr5370322qto.264.1615428152185; Wed, 10 Mar 2021 18:02:32 -0800 (PST) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id f8sm805162qth.6.2021.03.10.18.02.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 18:02:31 -0800 (PST) From: Sean Anderson To: u-boot@lists.denx.de, Simon Glass , Tom Rini , Rick Chen Cc: Bin Meng , Heinrich Schuchardt , Leo Liang , Marek Vasut , Ley Foon Tan , Jagan Teki , Sean Anderson , Jack Mitchell Subject: [PATCH v6 4/6] wdt: dw: Free the clock on error Date: Wed, 10 Mar 2021 21:02:20 -0500 Message-Id: <20210311020222.1795936-5-seanga2@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210311020222.1795936-1-seanga2@gmail.com> References: <20210311020222.1795936-1-seanga2@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean The clock subsystem requires that clk_free be called on clocks obtained via clk_get_*. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- (no changes since v4) Changes in v4: - Fix build error without CONFIG_CLK drivers/watchdog/designware_wdt.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index 709a67fbc3..9e5487168c 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -131,11 +131,13 @@ static int designware_wdt_probe(struct udevice *dev) ret = clk_enable(&clk); if (ret) - return ret; + goto err; priv->clk_khz = clk_get_rate(&clk) / 1000; - if (!priv->clk_khz) - return -EINVAL; + if (!priv->clk_khz) { + ret = -EINVAL; + goto err; + } #else priv->clk_khz = CONFIG_DW_WDT_CLOCK_KHZ; #endif @@ -145,15 +147,21 @@ static int designware_wdt_probe(struct udevice *dev) ret = reset_get_bulk(dev, &resets); if (ret) - return ret; + goto err; ret = reset_deassert_bulk(&resets); if (ret) - return ret; + goto err; } /* reset to disable the watchdog */ return designware_wdt_stop(dev); + +err: +#if CONFIG_IS_ENABLED(CLK) + clk_free(&clk); +#endif + return ret; } static const struct wdt_ops designware_wdt_ops = {