From 9f22bc4d29ec6b8b4c65c0be4769906b73a21829 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Mon, 3 Aug 2009 14:22:53 +0200
Subject: [PATCH] --- yaml --- r: 156287 b: refs/heads/master c:
 c96e7c7a3a79931446ecf9494a8415e4d164ebd8 h: refs/heads/master i:   156285:
 6ca05add40fc830fdcbc8bcfa693fe000662d1b3   156283:
 2e5e4a54f392383aaa0b5355c12df5031ab689c1   156279:
 c5c2f812fe22f5678439d1cf2734aaa4814ab6af   156271:
 4e0982c591130a1fb8aea7c4b3cece6452a05612   156255:
 38a3f6c9d71bd703707ae4bd11b7636015f230bf   156223:
 72a363a8f5a94786b748934b80526ddb7ff65b4f   156159:
 dc27219e59a7839a986ecde66408ad52f82ac14c v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/gpu/drm/ttm/ttm_bo.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 650170aba64b..d0f965aa68b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa99239cb73dbf419bea9f334b85ba94ac88a532
+refs/heads/master: c96e7c7a3a79931446ecf9494a8415e4d164ebd8
diff --git a/trunk/drivers/gpu/drm/ttm/ttm_bo.c b/trunk/drivers/gpu/drm/ttm/ttm_bo.c
index aa82d5370c38..c2b0d710d10f 100644
--- a/trunk/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/trunk/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1182,13 +1182,14 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
 
 int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 {
-	struct ttm_mem_type_manager *man = &bdev->man[mem_type];
+	struct ttm_mem_type_manager *man;
 	int ret = -EINVAL;
 
 	if (mem_type >= TTM_NUM_MEM_TYPES) {
 		printk(KERN_ERR TTM_PFX "Illegal memory type %d\n", mem_type);
 		return ret;
 	}
+	man = &bdev->man[mem_type];
 
 	if (!man->has_type) {
 		printk(KERN_ERR TTM_PFX "Trying to take down uninitialized "