From 029ff2b7fb05ccc21c1ba1de5c48c14112730b92 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Wed, 7 Jan 2009 11:54:57 +1000
Subject: [PATCH] --- yaml --- r: 126873 b: refs/heads/master c:
 a75f28419a7efff611a81293d41d0e2137d7591e h: refs/heads/master i:   126871:
 b7636c0bb09aa9fb0db3419bbd8e264dfabb2a2a v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/gpu/drm/drm_drv.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7cc7aacf472d..a7c2ec082349 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 241fa85b2bb655224357d713c251077dee3585ce
+refs/heads/master: a75f28419a7efff611a81293d41d0e2137d7591e
diff --git a/trunk/drivers/gpu/drm/drm_drv.c b/trunk/drivers/gpu/drm/drm_drv.c
index febb517ee679..5ff88d952226 100644
--- a/trunk/drivers/gpu/drm/drm_drv.c
+++ b/trunk/drivers/gpu/drm/drm_drv.c
@@ -314,14 +314,14 @@ static void drm_cleanup(struct drm_device * dev)
 		DRM_DEBUG("mtrr_del=%d\n", retval);
 	}
 
+	if (dev->driver->unload)
+		dev->driver->unload(dev);
+
 	if (drm_core_has_AGP(dev) && dev->agp) {
 		drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
 		dev->agp = NULL;
 	}
 
-	if (dev->driver->unload)
-		dev->driver->unload(dev);
-
 	drm_ht_remove(&dev->map_hash);
 	drm_ctxbitmap_cleanup(dev);