mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-28 07:30:26 +09:00
wdt: dw: Free the clock on error
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>
This commit is contained in:
parent
4cb0ab4ebc
commit
97bcdd28ad
@ -131,11 +131,13 @@ static int designware_wdt_probe(struct udevice *dev)
|
|||||||
|
|
||||||
ret = clk_enable(&clk);
|
ret = clk_enable(&clk);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
goto err;
|
||||||
|
|
||||||
priv->clk_khz = clk_get_rate(&clk) / 1000;
|
priv->clk_khz = clk_get_rate(&clk) / 1000;
|
||||||
if (!priv->clk_khz)
|
if (!priv->clk_khz) {
|
||||||
return -EINVAL;
|
ret = -EINVAL;
|
||||||
|
goto err;
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
priv->clk_khz = CONFIG_DW_WDT_CLOCK_KHZ;
|
priv->clk_khz = CONFIG_DW_WDT_CLOCK_KHZ;
|
||||||
#endif
|
#endif
|
||||||
@ -145,15 +147,21 @@ static int designware_wdt_probe(struct udevice *dev)
|
|||||||
|
|
||||||
ret = reset_get_bulk(dev, &resets);
|
ret = reset_get_bulk(dev, &resets);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
goto err;
|
||||||
|
|
||||||
ret = reset_deassert_bulk(&resets);
|
ret = reset_deassert_bulk(&resets);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* reset to disable the watchdog */
|
/* reset to disable the watchdog */
|
||||||
return designware_wdt_stop(dev);
|
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 = {
|
static const struct wdt_ops designware_wdt_ops = {
|
||||||
|
Loading…
Reference in New Issue
Block a user