Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 310250
b: refs/heads/master
c: 688ec34
h: refs/heads/master
v: v3
  • Loading branch information
Axel Lin authored and Florian Tobias Schandinat committed Apr 9, 2012
1 parent d5e759a commit 5e27cce
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 79d3c41ae444fb064cc8aab7cb249f577d6e0aae
refs/heads/master: 688ec344a62e85f221d7a310a1209cf9b1209fd3
5 changes: 1 addition & 4 deletions trunk/drivers/video/pxa3xx-gcu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit 5e27cce

Please sign in to comment.