summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGUO Zihua <guozihua@huawei.com>2022-11-22 16:50:46 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-01-18 11:30:32 +0100
commitd261f7c95bd9d8abb7e5619b4a605998fdc3049f (patch)
tree622c3ee5cbdbd584173a1b2c6bdb8300c77c2599
parent2ce242e1b9ad31c1f68496b3548e407a8cb2c07d (diff)
downloadlinux-stable-d261f7c95bd9d8abb7e5619b4a605998fdc3049f.tar.gz
linux-stable-d261f7c95bd9d8abb7e5619b4a605998fdc3049f.tar.bz2
linux-stable-d261f7c95bd9d8abb7e5619b4a605998fdc3049f.zip
rtc: mxc_v2: Add missing clk_disable_unprepare()
[ Upstream commit 55d5a86618d3b1a768bce01882b74cbbd2651975 ] The call to clk_disable_unprepare() is left out in the error handling of devm_rtc_allocate_device. Add it back. Fixes: 5490a1e018a4 ("rtc: mxc_v2: fix possible race condition") Signed-off-by: GUO Zihua <guozihua@huawei.com> Link: https://lore.kernel.org/r/20221122085046.21689-1-guozihua@huawei.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/rtc/rtc-mxc_v2.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-mxc_v2.c b/drivers/rtc/rtc-mxc_v2.c
index 45c7366b7286..c16aa4a389e9 100644
--- a/drivers/rtc/rtc-mxc_v2.c
+++ b/drivers/rtc/rtc-mxc_v2.c
@@ -335,8 +335,10 @@ static int mxc_rtc_probe(struct platform_device *pdev)
}
pdata->rtc = devm_rtc_allocate_device(&pdev->dev);
- if (IS_ERR(pdata->rtc))
+ if (IS_ERR(pdata->rtc)) {
+ clk_disable_unprepare(pdata->clk);
return PTR_ERR(pdata->rtc);
+ }
pdata->rtc->ops = &mxc_rtc_ops;
pdata->rtc->range_max = U32_MAX;