---

yaml --- r: 242312 b: refs/heads/master c: 09bfa51 h: refs/heads/master v: v3
git-mirror · Mar 23, 2011 · 7e26859 · 7e26859
1 parent cd1ff14
commit 7e26859
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00d70b15125030391d17baab2c2f70f93b3339a6
+refs/heads/master: 09bfa51773c1e90f13000dc2fc0c4b84047009bc
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -1796,8 +1796,10 @@ i915_gem_request_remove_from_client(struct drm_i915_gem_request *request)
 		return;
 
 	spin_lock(&file_priv->mm.lock);
-	list_del(&request->client_list);
-	request->file_priv = NULL;
+	if (request->file_priv) {
+		list_del(&request->client_list);
+		request->file_priv = NULL;
+	}
 	spin_unlock(&file_priv->mm.lock);
 }