---

yaml --- r: 205117 b: refs/heads/master c: e0a2ca7 h: refs/heads/master i: 205115: 5a50043 v: v3
git-mirror · Aug 2, 2010 · 6d32a8a · 6d32a8a
1 parent e8cf54e
commit 6d32a8a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;