---

yaml --- r: 322298 b: refs/heads/master c: 54f32a3 h: refs/heads/master v: v3
git-mirror · Aug 8, 2012 · 3bf7167 · 3bf7167
1 parent 133ccbc
commit 3bf7167
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);