Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs...

[~andy/linux] / drivers / watchdog / s3c2410_wdt.c

diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index b0dab10fc6a5122a2947addcf78238a30476a5a9..27bcd4e2c4a4f3b2063aa2f38a4fc6927f0e565d 100644 (file)
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -354,7 +354,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
                goto err_map;
        }
 
-       clk_enable(wdt_clock);
+       clk_prepare_enable(wdt_clock);
 
        ret = s3c2410wdt_cpufreq_register();
        if (ret < 0) {
@@ -421,7 +421,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
        s3c2410wdt_cpufreq_deregister();
 
  err_clk:
-       clk_disable(wdt_clock);
+       clk_disable_unprepare(wdt_clock);
        clk_put(wdt_clock);
        wdt_clock = NULL;
 
@@ -445,7 +445,7 @@ static int s3c2410wdt_remove(struct platform_device *dev)
 
        s3c2410wdt_cpufreq_deregister();
 
-       clk_disable(wdt_clock);
+       clk_disable_unprepare(wdt_clock);
        clk_put(wdt_clock);
        wdt_clock = NULL;