From patchwork Tue Sep 1 20:07:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1355343 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=BdXKoQeT; 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 4BgypK0TdJz9sTR for ; Wed, 2 Sep 2020 06:09:28 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 96440822BF; Tue, 1 Sep 2020 22:08:25 +0200 (CEST) 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="BdXKoQeT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 925FE822B4; Tue, 1 Sep 2020 22:08:21 +0200 (CEST) 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,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) (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 D04B98228A for ; Tue, 1 Sep 2020 22:08:18 +0200 (CEST) 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-qk1-x743.google.com with SMTP id o5so2209455qke.12 for ; Tue, 01 Sep 2020 13:08:18 -0700 (PDT) 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=trbLndycnLo7gvgwkapOQm3DpKtdH9q11qfAbsfHALw=; b=BdXKoQeTwb+rvv/y51VSOsX6nPaGMTG2ZBOPv99grXdD0ccdrrc7BH7ZuWlj00w9Aa 9QlB4eW2jMpsZ6UvQBhwCXwpSEmG/k2TPEgHOCoDAiXFPzx4hLAh07miNV1/ijmpYRjA 2jnz3jZSBAgQG7Yfv+Vd/uKUAsIZh7lYhUUbq6FKrfrCZxwPB1MAY24SiLEw8v8Sk1M1 eP94Wamkh8vjvMt+a08COlhxoV4rMxXs+AJM3m/lVIDCLU97yttoV8tfgaBZ7wVelJsk IB9uhS9zPJWTe8NbdQn0hzdVaEyGLajcUiQFgA7KL6eNGXDWaTMv2KwUwi0B3Y3te0Ax SCTQ== 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=trbLndycnLo7gvgwkapOQm3DpKtdH9q11qfAbsfHALw=; b=TB+CQmIDAXYxmqg1+jSUlTXGrxSLxu9Dk0dHLeMq07TH2JYhaRo5BynEGRu6DvSrTQ I0yE1EKjHeq18myYyDolRajSZ3FQb5tm8sjAVEYBoqZSw3JH4yToOqG763xWHfgqvnHg /SBqXeMdOR4uOg2WkHVBMgupDkqsk1iaRE/coPvFp+Y4ohI118n/Lj/b3YDZFg0SB8bM xfOvz0kouF3nCxmN+yXwCGnFgpZ0TuTJm9ohe+AuaHS/ktq+7Rahteuf2qAPa+eQgRCQ 1P5OMHikBGZpfvKUMVZnymCFrv9/Lt4Kz4QTpB/ug0J5G1+ODNONe5KZV25m+w9YkFhU vNfQ== X-Gm-Message-State: AOAM533fr4S7+spwtMmiOPx/xb0f46i/NElupIhD/Qv2qjpH6LRiPf1j ipAR+9VDhvoKw0WPzmPHKDDvel8TVqRD8xPU X-Google-Smtp-Source: ABdhPJzyDaBDbmrK+H7BfGBhx/Z+QJxS3SR+d73qitqsj7bXBIRlBjcretL4uFm7IpbIOKg5DTOdhw== X-Received: by 2002:a37:92c7:: with SMTP id u190mr3671825qkd.110.1598990897653; Tue, 01 Sep 2020 13:08:17 -0700 (PDT) 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 y24sm2545039qtv.71.2020.09.01.13.08.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 13:08:17 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Bin Meng , Heinrich Schuchardt , Jagan Teki , Simon Glass , Marek Vasut , Sean Anderson Subject: [PATCH v3 5/7] wdt: dw: Free the clock on error Date: Tue, 1 Sep 2020 16:07:56 -0400 Message-Id: <20200901200758.543851-6-seanga2@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200901200758.543851-1-seanga2@gmail.com> References: <20200901200758.543851-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 v1) drivers/watchdog/designware_wdt.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index e6f5437056..189d555f29 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,20 @@ 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); + return ret; } static const struct wdt_ops designware_wdt_ops = {