OSDN Git Service

watchdog: sprd_wdt: Fix error handling in sprd_wdt_enable()
authorAlexey Khoroshilov <khoroshilov@ispras.ru>
Thu, 8 Mar 2018 21:21:48 +0000 (00:21 +0300)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Tue, 13 Mar 2018 18:14:18 +0000 (19:14 +0100)
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>
drivers/watchdog/sprd_wdt.c

index a8b280f..b4d484a 100644 (file)
@@ -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);