2 files changed, 6 insertions, 13 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 6cb77d67..4ee1ab43 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -409,7 +409,7 @@ static void gk20a_wait_until_counter_is_N(
                 if (NVGPU_COND_WAIT(
                             c,
                             atomic_read(counter) == wait_value,
-                            msecs_to_jiffies(5000)) > 0)
+                            5000) == 0)
                         break;
 
                 nvgpu_warn(ch->g,
@@ -1798,14 +1798,14 @@ static int gk20a_channel_poll_worker(void *arg)
 
         start_wait = jiffies;
         while (!nvgpu_thread_should_stop(&worker->poll_task)) {
-                bool got_events;
+                int ret;
 
-                got_events = NVGPU_COND_WAIT(
+                ret = NVGPU_COND_WAIT(
                                 &worker->wq,
                                 __gk20a_channel_worker_pending(g, get),
-                                timeout) > 0;
+                                jiffies_to_msecs(timeout)) > 0;
 
-                if (got_events)
+                if (ret == 0)
                         gk20a_channel_worker_process(g, &get);
 
                 if (jiffies - start_wait >= timeout) {
diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
index 3964c37d..7c5d33c7 100644
--- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
@@ -203,20 +203,13 @@ void gk20a_init_fence(struct gk20a_fence *f,
 
 static int nvgpu_semaphore_fence_wait(struct gk20a_fence *f, long timeout)
 {
-        long remain;
-
         if (!nvgpu_semaphore_is_acquired(f->semaphore))
                 return 0;
 
-        remain = NVGPU_COND_WAIT_INTERRUPTIBLE(
+        return NVGPU_COND_WAIT_INTERRUPTIBLE(
                 f->semaphore_wq,
                 !nvgpu_semaphore_is_acquired(f->semaphore),
                 timeout);
-        if (remain == 0 && nvgpu_semaphore_is_acquired(f->semaphore))
-                return -ETIMEDOUT;
-        else if (remain < 0)
-                return remain;
-        return 0;
 }
 
 static bool nvgpu_semaphore_fence_is_expired(struct gk20a_fence *f)