1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index f2713851aaab..3ed571a2ab18 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -159,6 +159,7 @@ static int omap_wdt_open(struct inode *inode, struct file *file)
         file->private_data = (void *) wdev;
 
         omap_wdt_set_timeout(wdev);
+        omap_wdt_ping(wdev); /* trigger loading of new timeout value */
         omap_wdt_enable(wdev);
 
         return nonseekable_open(inode, file);
@@ -313,6 +314,9 @@ static int __devinit omap_wdt_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, wdev);
 
+        clk_enable(wdev->ick);
+        clk_enable(wdev->fck);
+
         omap_wdt_disable(wdev);
         omap_wdt_adjust_timeout(timer_margin);
 
@@ -332,6 +336,9 @@ static int __devinit omap_wdt_probe(struct platform_device *pdev)
         /* autogate OCP interface clock */
         __raw_writel(0x01, wdev->base + OMAP_WATCHDOG_SYS_CONFIG);
 
+        clk_disable(wdev->ick);
+        clk_disable(wdev->fck);
+
         omap_wdt_dev = pdev;
 
         return 0;