1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
index 77e93458..3682d904 100644
--- a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
@@ -686,11 +686,13 @@ void gk20a_ctxsw_trace_tsg_reset(struct gk20a *g, struct tsg_gk20a *tsg)
                 return;
 
         mutex_lock(&tsg->ch_list_lock);
-        ch = list_entry(&tsg->ch_list, struct channel_gk20a, ch_entry);
+        if (!list_empty(&tsg->ch_list)) {
+                ch = list_entry(tsg->ch_list.next,
+                                struct channel_gk20a, ch_entry);
+                entry.pid = ch->pid;
+        }
         mutex_unlock(&tsg->ch_list_lock);
 
-        entry.pid = ch->pid;
-
         gk20a_ctxsw_trace_write(g, &entry);
         gk20a_ctxsw_trace_wake_up(g, 0);
 #endif