From patchwork Tue Dec 22 23:59:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1419535 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; dmarc=pass (p=none dis=none) header.from=gmail.com 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=qkYKxtcK; 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 4D0tcK0Mqjz9sVj for ; Wed, 23 Dec 2020 10:59:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 606A282B0F; Wed, 23 Dec 2020 00:59:23 +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="qkYKxtcK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7AD8782A3F; Wed, 23 Dec 2020 00:59:16 +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,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf2b.google.com (mail-qv1-xf2b.google.com [IPv6:2607:f8b0:4864:20::f2b]) (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 20237826D9 for ; Wed, 23 Dec 2020 00:59:13 +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-qv1-xf2b.google.com with SMTP id d11so6830883qvo.11 for ; Tue, 22 Dec 2020 15:59:13 -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=UUDCgE7cTnGErtR1aFjpkbd99tHMSHyRNsB9k+K7Z64=; b=qkYKxtcKsxp2SAk+tPcpTp9g2R8rINb1OlcVNZW7bJ0WJsEQuWN39aDxTIhiJjIxc4 m9kMRzaFUc++T+OuPMbyC/+u/g1eW9eAieoM+aLAFZi5CG8EwSC0oMu5HUn27xdMRvvq 2jCnGGmFHeRPWO7hBz6rtdzKwtkIrsoCGdB69+vKkwsTukv0UtvuT/Cd6NakbSdbpbK9 rxj2w90BxHhw+KZfbeDQcchdHyiw9eUOHLnQ3keiabiqC0n2ZGjKGymBR4xhDCP0L8s9 1T896UU1wet4TIYkNkHJBOmlMNomHiHG038uMSqGvw4dFQEvNmRhkPpml+2zlaI7+DeN HXGg== 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=UUDCgE7cTnGErtR1aFjpkbd99tHMSHyRNsB9k+K7Z64=; b=bzqcDQZ4f5dhg/CXItwFunEu+v0CrhVWRXWMkS4awHlB6m4Up9l1AEqcwy1LA6XesD 3nQVsaIH+wAJegYtNxIuJ+b1le1AVmK2JP5TcA0vBgjCTSrOrLZ04HMgXRgZA+1bRfJc +XFdYGqbFAoax60O1yyt2TreRJo5f7aHhFuDYkT1c7WZLo5eqMfP4wo/motkp9fqM43S B3Cg9JvojkZGCFPZqmn0y6lAfJEaIlkwkfICPgnoU6uNTfHVM91DqSv91TRP2DRZMWr/ JzUgQ24VNLZOJ2H38cbai5RzVwVkRqVUvZ6HSgwmrrSvJk23Gag9gJzaCmnsHeqpe2V2 1DeQ== X-Gm-Message-State: AOAM533aF5hMB7l1YgcxR2XyJrqGDYJiId/HAJ7Fay53OmdImHX0+PWp xL0tqSFmTvVPQTax4vWtXg3cXaejUhKIow== X-Google-Smtp-Source: ABdhPJzkehuHDKiqM+NAcz/qv4We5Izi6M9cqaf8/7n/NYvsmgSPrH1u8cSaQeGJmRMiiWyVZOb9yg== X-Received: by 2002:a0c:8601:: with SMTP id p1mr24866125qva.22.1608681551935; Tue, 22 Dec 2020 15:59:11 -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 j29sm13097739qtv.11.2020.12.22.15.59.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Dec 2020 15:59:11 -0800 (PST) From: Sean Anderson To: u-boot@lists.denx.de Cc: Marek Vasut , Jagan Teki , Heinrich Schuchardt , Simon Glass , Bin Meng , Sean Anderson Subject: [PATCH v5 4/6] wdt: dw: Free the clock on error Date: Tue, 22 Dec 2020 18:59:01 -0500 Message-Id: <20201222235903.131751-5-seanga2@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201222235903.131751-1-seanga2@gmail.com> References: <20201222235903.131751-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.3 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 e6f5437056..b952737fb4 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 = {