From e12f45454722cd9db9d430d236f5e7a4823a4db4 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 2 Nov 2008 23:38:20 -0800
Subject: [PATCH] --- yaml --- r: 118675 b: refs/heads/master c:
 ad42ca8f4490de06462aee234ea0083cbd8b46aa h: refs/heads/master i:   118673:
 7cabd21790ff9f34ede3b7db25ad7b924c95e152   118671:
 625076c76cd47cc7de34d7628f15f30142e126d9 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_dma.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 60a846e7b506..157cdb7d2a2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 881ee9889c8b98671c5491e43666bf5d4f78a180
+refs/heads/master: ad42ca8f4490de06462aee234ea0083cbd8b46aa
diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c
index 256e22963ae4..79944460d70a 100644
--- a/trunk/drivers/gpu/drm/i915/i915_dma.c
+++ b/trunk/drivers/gpu/drm/i915/i915_dma.c
@@ -154,6 +154,9 @@ static int i915_dma_cleanup(struct drm_device * dev)
 	if (I915_NEED_GFX_HWS(dev))
 		i915_free_hws(dev);
 
+	dev_priv->sarea = NULL;
+	dev_priv->sarea_priv = NULL;
+
 	return 0;
 }