diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/watchdog/sp805_wdt.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c index 76c73cbf0040..8872642505c0 100644 --- a/drivers/watchdog/sp805_wdt.c +++ b/drivers/watchdog/sp805_wdt.c | |||
@@ -130,16 +130,10 @@ static int wdt_config(struct watchdog_device *wdd, bool ping) | |||
130 | int ret; | 130 | int ret; |
131 | 131 | ||
132 | if (!ping) { | 132 | if (!ping) { |
133 | ret = clk_prepare(wdt->clk); | ||
134 | if (ret) { | ||
135 | dev_err(&wdt->adev->dev, "clock prepare fail"); | ||
136 | return ret; | ||
137 | } | ||
138 | 133 | ||
139 | ret = clk_enable(wdt->clk); | 134 | ret = clk_prepare_enable(wdt->clk); |
140 | if (ret) { | 135 | if (ret) { |
141 | dev_err(&wdt->adev->dev, "clock enable fail"); | 136 | dev_err(&wdt->adev->dev, "clock enable fail"); |
142 | clk_unprepare(wdt->clk); | ||
143 | return ret; | 137 | return ret; |
144 | } | 138 | } |
145 | } | 139 | } |
@@ -190,8 +184,7 @@ static int wdt_disable(struct watchdog_device *wdd) | |||
190 | readl_relaxed(wdt->base + WDTLOCK); | 184 | readl_relaxed(wdt->base + WDTLOCK); |
191 | spin_unlock(&wdt->lock); | 185 | spin_unlock(&wdt->lock); |
192 | 186 | ||
193 | clk_disable(wdt->clk); | 187 | clk_disable_unprepare(wdt->clk); |
194 | clk_unprepare(wdt->clk); | ||
195 | 188 | ||
196 | return 0; | 189 | return 0; |
197 | } | 190 | } |