From 3bf7167b30e686c9f81dcff23ff3033052312b32 Mon Sep 17 00:00:00 2001
From: Jon Hunter <jon-hunter@ti.com>
Date: Fri, 13 Jul 2012 15:12:03 -0500
Subject: [PATCH] --- yaml --- r: 322298 b: refs/heads/master c:
 54f32a35f4d3a653a18a2c8c239f19ae060bd803 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/plat-omap/dmtimer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 18f879f0766d..5a7a0d954635 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36b547aa20d1cf0d62bace7b8a9928aa33de36cd
+refs/heads/master: 54f32a35f4d3a653a18a2c8c239f19ae060bd803
diff --git a/trunk/arch/arm/plat-omap/dmtimer.c b/trunk/arch/arm/plat-omap/dmtimer.c
index 626ad8cad7a9..7b6689af0cce 100644
--- a/trunk/arch/arm/plat-omap/dmtimer.c
+++ b/trunk/arch/arm/plat-omap/dmtimer.c
@@ -258,7 +258,7 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_enable);
 
 void omap_dm_timer_disable(struct omap_dm_timer *timer)
 {
-	pm_runtime_put(&timer->pdev->dev);
+	pm_runtime_put_sync(&timer->pdev->dev);
 }
 EXPORT_SYMBOL_GPL(omap_dm_timer_disable);