---

yaml --- r: 310675 b: refs/heads/master c: 5025ce0 h: refs/heads/master i: 310673: 431d1d4 310671: ed87f2b v: v3
git-mirror · Jun 4, 2012 · d3a8388 · d3a8388
1 parent b40cf87
commit d3a8388
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: d1700f9258552294300083eb62f83262f21ae1db
+refs/heads/master: 5025ce070e2dff80bcf015a34a82edcf78229287
diff --git a/trunk/drivers/video/omap2/dss/dss.c b/trunk/drivers/video/omap2/dss/dss.c
@@ -731,7 +731,7 @@ static void dss_runtime_put(void)
 	DSSDBG("dss_runtime_put\n");
 
 	r = pm_runtime_put_sync(&dss.pdev->dev);
-	WARN_ON(r < 0);
+	WARN_ON(r < 0 && r != -EBUSY);
 }
 
 /* DEBUGFS */