diff options
| author | Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com> | 2016-09-12 10:23:49 +0300 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2016-09-24 09:49:41 +0300 |
| commit | eadc4fe17d04723373ada219d382b3b413b21dad (patch) | |
| tree | 18918db353efb3a565a8bffe188c657513998f1b | |
| parent | bfb1f46f69060642d54125cb777c817f3f9436e3 (diff) | |
| download | linux-eadc4fe17d04723373ada219d382b3b413b21dad.tar.xz | |
watchdog: cadence_wdt: Fix the suspend resume
Currently even if no users are there the suspend tries to
stop the watchdog and resume starts it.
so after resume the watchdog starts and resets the board.
Fix the same by adding a check for users.
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| -rw-r--r-- | drivers/watchdog/cadence_wdt.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/watchdog/cadence_wdt.c b/drivers/watchdog/cadence_wdt.c index 4dda9024e229..0fd267eb9342 100644 --- a/drivers/watchdog/cadence_wdt.c +++ b/drivers/watchdog/cadence_wdt.c @@ -424,8 +424,10 @@ static int __maybe_unused cdns_wdt_suspend(struct device *dev) struct platform_device *pdev = to_platform_device(dev); struct cdns_wdt *wdt = platform_get_drvdata(pdev); - cdns_wdt_stop(&wdt->cdns_wdt_device); - clk_disable_unprepare(wdt->clk); + if (watchdog_active(&wdt->cdns_wdt_device)) { + cdns_wdt_stop(&wdt->cdns_wdt_device); + clk_disable_unprepare(wdt->clk); + } return 0; } @@ -442,12 +444,14 @@ static int __maybe_unused cdns_wdt_resume(struct device *dev) struct platform_device *pdev = to_platform_device(dev); struct cdns_wdt *wdt = platform_get_drvdata(pdev); - ret = clk_prepare_enable(wdt->clk); - if (ret) { - dev_err(dev, "unable to enable clock\n"); - return ret; + if (watchdog_active(&wdt->cdns_wdt_device)) { + ret = clk_prepare_enable(wdt->clk); + if (ret) { + dev_err(dev, "unable to enable clock\n"); + return ret; + } + cdns_wdt_start(&wdt->cdns_wdt_device); } - cdns_wdt_start(&wdt->cdns_wdt_device); return 0; } |