From d3a83883c4474a328a0fa18235e66371a3cbc708 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Wed, 23 May 2012 17:02:26 +0300
Subject: [PATCH] --- yaml --- r: 310675 b: refs/heads/master c:
 5025ce070e2dff80bcf015a34a82edcf78229287 h: refs/heads/master i:   310673:
 431d1d49d89677a542e78dbec9cded8d00945f2b   310671:
 ed87f2b8b85d08f321678a29b09ac415fa4e6b7e v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/video/omap2/dss/dss.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e15aac9f2d15..156eec97dd21 100644
--- 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
index 6ea1ff149f6f..770632359a17 100644
--- 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 */