---

yaml --- r: 228673 b: refs/heads/master c: 6dda569 h: refs/heads/master i: 228671: b95ec6d v: v3
git-mirror · Oct 29, 2010 · 12ca1b2 · 12ca1b2
1 parent ca87a2f
commit 12ca1b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4066c0ae13a8388b9f2a29cad60da330b578eff2
+refs/heads/master: 6dda569fe0fb71a03e2a2e815761796f98232cdb
diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c
@@ -2082,7 +2082,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 out_iomapfree:
 	io_mapping_free(dev_priv->mm.gtt_mapping);
 out_rmmap:
-	iounmap(dev_priv->regs);
+	pci_iounmap(dev->pdev, dev_priv->regs);
 put_bridge:
 	pci_dev_put(dev_priv->bridge_dev);
 free_priv:
@@ -2168,7 +2168,7 @@ int i915_driver_unload(struct drm_device *dev)
 	}
 
 	if (dev_priv->regs != NULL)
-		iounmap(dev_priv->regs);
+		pci_iounmap(dev->pdev, dev_priv->regs);
 
 	intel_teardown_gmbus(dev);
 	intel_teardown_mchbar(dev);