From 689cbb80544b5e36aef6d69ecd486e7283efbaa5 Mon Sep 17 00:00:00 2001
From: "Karicheri, Muralidharan" <m-karicheri2@ti.com>
Date: Thu, 30 Aug 2012 18:29:10 +0000
Subject: [PATCH] --- yaml --- r: 347983 b: refs/heads/master c:
 5235f57a6f460d5620acfcf236ca29ecca993325 h: refs/heads/master i:   347981:
 c172a6ea4278952b3a2cdd770a020958f8e7d7ac   347979:
 58696c18dcb61d7ba80949ebc0fa70f2fb1c71ed   347975:
 b8be08165f35dd79112ccb9e1d24a37a6130a1ee   347967:
 d9d148d25091efe5baee797955b9405126726c2c v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/watchdog/davinci_wdt.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c05eade4b1c6..82c88cd68258 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63fbbc169674496fc2ae501d97c3905232a3bf64
+refs/heads/master: 5235f57a6f460d5620acfcf236ca29ecca993325
diff --git a/trunk/drivers/watchdog/davinci_wdt.c b/trunk/drivers/watchdog/davinci_wdt.c
index 8791879e5181..6000aea7e2e1 100644
--- a/trunk/drivers/watchdog/davinci_wdt.c
+++ b/trunk/drivers/watchdog/davinci_wdt.c
@@ -208,7 +208,7 @@ static int davinci_wdt_probe(struct platform_device *pdev)
 	if (WARN_ON(IS_ERR(wdt_clk)))
 		return PTR_ERR(wdt_clk);
 
-	clk_enable(wdt_clk);
+	clk_prepare_enable(wdt_clk);
 
 	if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)
 		heartbeat = DEFAULT_HEARTBEAT;
@@ -256,7 +256,7 @@ static int davinci_wdt_remove(struct platform_device *pdev)
 		wdt_mem = NULL;
 	}
 
-	clk_disable(wdt_clk);
+	clk_disable_unprepare(wdt_clk);
 	clk_put(wdt_clk);
 
 	return 0;