From: Alexey Khoroshilov <khoroshilov@ispras.ru>
Date: Thu, 8 Mar 2018 21:21:48 +0000 (+0300)
Subject: watchdog: sprd_wdt: Fix error handling in sprd_wdt_enable()
X-Git-Tag: v4.17-rc1~20^2~2^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c578cd4bc52b6e65d65be1abad9a8aa489ec207;p=thirdparty%2Fkernel%2Flinux.git

watchdog: sprd_wdt: Fix error handling in sprd_wdt_enable()

If clk_prepare_enable(wdt->rtc_enable) fails,
wdt->enable clock is left enabled.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
---

diff --git a/drivers/watchdog/sprd_wdt.c b/drivers/watchdog/sprd_wdt.c
index a8b280ff33e05..b4d484a42b703 100644
--- a/drivers/watchdog/sprd_wdt.c
+++ b/drivers/watchdog/sprd_wdt.c
@@ -154,8 +154,10 @@ static int sprd_wdt_enable(struct sprd_wdt *wdt)
 	if (ret)
 		return ret;
 	ret = clk_prepare_enable(wdt->rtc_enable);
-	if (ret)
+	if (ret) {
+		clk_disable_unprepare(wdt->enable);
 		return ret;
+	}
 
 	sprd_wdt_unlock(wdt->base);
 	val = readl_relaxed(wdt->base + SPRD_WDT_CTRL);