From b9bc63b8e19669bd07faac554d70666ca44415e9 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@starflyer.(none)>
Date: Thu, 7 Jul 2005 20:17:42 +1000
Subject: [PATCH] --- yaml --- r: 4419 b: refs/heads/master c:
 f650130803c4c0b5e5d76eff24faae722e3a69e2 h: refs/heads/master i:   4417:
 51b41b807a5b1bd173c8105156047efbb1223657   4415:
 88a034e3af51d30a60f7f5e15adb6d44575150a3 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/char/drm/drm_fops.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e344949224b6..b8970275b52a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c7b525c344bc29a760c37053f8d5c80292ee1be
+refs/heads/master: f650130803c4c0b5e5d76eff24faae722e3a69e2
diff --git a/trunk/drivers/char/drm/drm_fops.c b/trunk/drivers/char/drm/drm_fops.c
index 7f9b00c6d244..a53322d8c229 100644
--- a/trunk/drivers/char/drm/drm_fops.c
+++ b/trunk/drivers/char/drm/drm_fops.c
@@ -259,7 +259,7 @@ int drm_release( struct inode *inode, struct file *filp )
 	drm_fasync( -1, filp, 0 );
 
 	down( &dev->ctxlist_sem );
-	if ( !list_empty( &dev->ctxlist->head ) ) {
+	if ( dev->ctxlist && (!list_empty(&dev->ctxlist->head))) {
 		drm_ctx_list_t *pos, *n;
 
 		list_for_each_entry_safe( pos, n, &dev->ctxlist->head, head ) {