From 6d32a8aafa0323895e83b984914f52737cbd7a7b Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Thu, 8 Jul 2010 12:24:52 -0400
Subject: [PATCH] --- yaml --- r: 205117 b: refs/heads/master c:
 e0a2ca737597de5068634df2706f4cf1c1e32d84 h: refs/heads/master i:   205115:
 5a50043d9c808205003de4848c59a419c455d79e v: v3

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

diff --git a/[refs] b/[refs]
index 7d4282238212..3f244928aacf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab9e1f5966591dc3e811418e96ba04f284c52458
+refs/heads/master: e0a2ca737597de5068634df2706f4cf1c1e32d84
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_device.c b/trunk/drivers/gpu/drm/radeon/radeon_device.c
index 0fea894fc127..a64811a94519 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_device.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_device.c
@@ -737,7 +737,8 @@ void radeon_device_fini(struct radeon_device *rdev)
 	destroy_workqueue(rdev->wq);
 	vga_switcheroo_unregister_client(rdev->pdev);
 	vga_client_register(rdev->pdev, NULL, NULL, NULL);
-	pci_iounmap(rdev->pdev, rdev->rio_mem);
+	if (rdev->rio_mem)
+		pci_iounmap(rdev->pdev, rdev->rio_mem);
 	rdev->rio_mem = NULL;
 	iounmap(rdev->rmmio);
 	rdev->rmmio = NULL;