diff options
-rw-r--r-- | drivers/watchdog/dw_wdt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c index 4d3906d7c9a5..b922bec45d15 100644 --- a/drivers/watchdog/dw_wdt.c +++ b/drivers/watchdog/dw_wdt.c | |||
@@ -255,14 +255,14 @@ static int dw_wdt_release(struct inode *inode, struct file *filp) | |||
255 | #ifdef CONFIG_PM_SLEEP | 255 | #ifdef CONFIG_PM_SLEEP |
256 | static int dw_wdt_suspend(struct device *dev) | 256 | static int dw_wdt_suspend(struct device *dev) |
257 | { | 257 | { |
258 | clk_disable(dw_wdt.clk); | 258 | clk_disable_unprepare(dw_wdt.clk); |
259 | 259 | ||
260 | return 0; | 260 | return 0; |
261 | } | 261 | } |
262 | 262 | ||
263 | static int dw_wdt_resume(struct device *dev) | 263 | static int dw_wdt_resume(struct device *dev) |
264 | { | 264 | { |
265 | int err = clk_enable(dw_wdt.clk); | 265 | int err = clk_prepare_enable(dw_wdt.clk); |
266 | 266 | ||
267 | if (err) | 267 | if (err) |
268 | return err; | 268 | return err; |
@@ -306,7 +306,7 @@ static int dw_wdt_drv_probe(struct platform_device *pdev) | |||
306 | if (IS_ERR(dw_wdt.clk)) | 306 | if (IS_ERR(dw_wdt.clk)) |
307 | return PTR_ERR(dw_wdt.clk); | 307 | return PTR_ERR(dw_wdt.clk); |
308 | 308 | ||
309 | ret = clk_enable(dw_wdt.clk); | 309 | ret = clk_prepare_enable(dw_wdt.clk); |
310 | if (ret) | 310 | if (ret) |
311 | return ret; | 311 | return ret; |
312 | 312 | ||
@@ -323,7 +323,7 @@ static int dw_wdt_drv_probe(struct platform_device *pdev) | |||
323 | return 0; | 323 | return 0; |
324 | 324 | ||
325 | out_disable_clk: | 325 | out_disable_clk: |
326 | clk_disable(dw_wdt.clk); | 326 | clk_disable_unprepare(dw_wdt.clk); |
327 | 327 | ||
328 | return ret; | 328 | return ret; |
329 | } | 329 | } |
@@ -332,7 +332,7 @@ static int dw_wdt_drv_remove(struct platform_device *pdev) | |||
332 | { | 332 | { |
333 | misc_deregister(&dw_wdt_miscdev); | 333 | misc_deregister(&dw_wdt_miscdev); |
334 | 334 | ||
335 | clk_disable(dw_wdt.clk); | 335 | clk_disable_unprepare(dw_wdt.clk); |
336 | 336 | ||
337 | return 0; | 337 | return 0; |
338 | } | 338 | } |