From 0b1a73e54c4958d4fe847f3ea500684e672341d7 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Fri, 12 Apr 2013 19:15:52 -0400
Subject: [PATCH] --- yaml --- r: 371415 b: refs/heads/master c:
 0cd9cb76ae26a19df21abc6f94f5fff141e689c7 h: refs/heads/master i:   371413:
 7ea7ad3e9c8c6997f932a10fdbaa1b1da52b909c   371411:
 7d544f1b51d86fc93aa32d07123424a75119af48   371407:
 a42ef2d3a812aee25d8e9ba99b706c97367200d7 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/gpu/drm/radeon/radeon_kms.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a9c0ba1da1a9..16b438486ca5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e97be73e5f74a317232740ae82eb8f95326a660
+refs/heads/master: 0cd9cb76ae26a19df21abc6f94f5fff141e689c7
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_kms.c b/trunk/drivers/gpu/drm/radeon/radeon_kms.c
index a24b9ba4de73..4f2d4f4c1dab 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_kms.c
@@ -50,9 +50,13 @@ int radeon_driver_unload_kms(struct drm_device *dev)
 
 	if (rdev == NULL)
 		return 0;
+	if (rdev->rmmio == NULL)
+		goto done_free;
 	radeon_acpi_fini(rdev);
 	radeon_modeset_fini(rdev);
 	radeon_device_fini(rdev);
+
+done_free:
 	kfree(rdev);
 	dev->dev_private = NULL;
 	return 0;