From 406f26d3a964cc023536268759a3e11d3f5ade1b Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 9 Dec 2009 15:32:23 +1000 Subject: [PATCH] --- yaml --- r: 174669 b: refs/heads/master c: 2e7b6f7fa62d92d941c626f8ae45f5cd75a52d55 h: refs/heads/master i: 174667: aefc0baaea6e903280e8e766e6c165a624b45282 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_fence.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e1735e2ec6bf..8f8a7eb034cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5cc6fbab9da5680e7e5d2507d0f0c2c52ff18031 +refs/heads/master: 2e7b6f7fa62d92d941c626f8ae45f5cd75a52d55 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_fence.c b/trunk/drivers/gpu/drm/radeon/radeon_fence.c index 78743cd70433..cb4cd97ae39f 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_fence.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_fence.c @@ -197,7 +197,7 @@ int radeon_fence_wait(struct radeon_fence *fence, bool intr) r = wait_event_interruptible_timeout(rdev->fence_drv.queue, radeon_fence_signaled(fence), timeout); radeon_irq_kms_sw_irq_put(rdev); - if (unlikely(r != 0)) + if (unlikely(r < 0)) return r; } else { radeon_irq_kms_sw_irq_get(rdev);