From 191e284709ee792a32124e96e43d5876406b93dc Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Tue, 12 Sep 2006 12:01:00 +0200
Subject: More bugfixes. Disable the i915 IRQ turnoff for now since it seems to
 be causing problems.

---
 linux-core/drm_fence.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'linux-core/drm_fence.c')

diff --git a/linux-core/drm_fence.c b/linux-core/drm_fence.c
index eaaf7f40..df5db702 100644
--- a/linux-core/drm_fence.c
+++ b/linux-core/drm_fence.c
@@ -359,12 +359,11 @@ int drm_fence_object_wait(drm_device_t * dev, drm_fence_object_t * fence,
 				    fence_signaled(dev, fence, mask, 1));
 			if (time_after_eq(jiffies, _end))
 				break;
-		} while (ret == -EINTR && ignore_signals);
-
+		} while (ret == -EINTR && ignore_signals);		
 		if (time_after_eq(jiffies, _end) && (ret != 0))
 			ret = -EBUSY;
-		return ret;
-
+		if (ret) 
+			return ((ret == -EINTR) ? -EAGAIN : ret);
 	} else {
 		int signaled;
 		do {
-- 
cgit v1.2.3