From: Sean Anderson <seanga2@gmail.com>
To: u-boot@lists.denx.de
Subject: [PATCH v5 4/6] wdt: dw: Free the clock on error
Date: Tue, 22 Dec 2020 18:59:01 -0500 [thread overview]
Message-ID: <20201222235903.131751-5-seanga2@gmail.com> (raw)
In-Reply-To: <20201222235903.131751-1-seanga2@gmail.com>
The clock subsystem requires that clk_free be called on clocks obtained via
clk_get_*.
Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
(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 = {
--
2.29.2
next prev parent reply other threads:[~2020-12-22 23:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-22 23:58 [PATCH v5 0/6] wdt: Add support for watchdogs on Kendryte K210 Sean Anderson
2020-12-22 23:58 ` [PATCH v5 1/6] wdt: dw: Switch to using fls for log2 Sean Anderson
2020-12-22 23:58 ` [PATCH v5 2/6] wdt: dw: Switch to if(CONFIG()) instead of using #if Sean Anderson
2020-12-22 23:59 ` [PATCH v5 3/6] wdt: dw: Enable the clock before using it Sean Anderson
2020-12-22 23:59 ` Sean Anderson [this message]
2020-12-22 23:59 ` [PATCH v5 5/6] riscv: Add watchdog bindings for the k210 Sean Anderson
2020-12-22 23:59 ` [PATCH v5 6/6] riscv: Enable watchdog " Sean Anderson
2021-03-03 11:08 ` Leo Liang
2021-01-13 6:13 ` [PATCH v5 0/6] wdt: Add support for watchdogs on Kendryte K210 Sean Anderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201222235903.131751-5-seanga2@gmail.com \
--to=seanga2@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.