From 5e27cce1686f2a18f1eca859a783dd820445ffd9 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Tue, 27 Mar 2012 11:15:56 +0800
Subject: [PATCH] --- yaml --- r: 310250 b: refs/heads/master c:
 688ec344a62e85f221d7a310a1209cf9b1209fd3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9c3305dfcc85..0a50e8549ab0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79d3c41ae444fb064cc8aab7cb249f577d6e0aae
+refs/heads/master: 688ec344a62e85f221d7a310a1209cf9b1209fd3
diff --git a/trunk/drivers/video/pxa3xx-gcu.c b/trunk/drivers/video/pxa3xx-gcu.c
index 1d71c08a818f..0b4ae0cebeda 100644
--- a/trunk/drivers/video/pxa3xx-gcu.c
+++ b/trunk/drivers/video/pxa3xx-gcu.c
@@ -316,12 +316,9 @@ pxa3xx_gcu_wait_idle(struct pxa3xx_gcu_priv *priv)
 		ret = wait_event_interruptible_timeout(priv->wait_idle,
 					!priv->shared->hw_running, HZ*4);
 
-		if (ret < 0)
+		if (ret != 0)
 			break;
 
-		if (ret > 0)
-			continue;
-
 		if (gc_readl(priv, REG_GCRBEXHR) == rbexhr &&
 		    priv->shared->num_interrupts == num) {
 			QERROR("TIMEOUT");