aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-10-29 16:02:18 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2010-10-29 16:02:18 -0400
commit6dda569fe0fb71a03e2a2e815761796f98232cdb (patch)
treee6558572b98a3098a63f3ccd37db6d008f88e31c /drivers
parent4066c0ae13a8388b9f2a29cad60da330b578eff2 (diff)
drm/i915: Switch to using pci_iounmap in conjunction with pci_iomap
After switching the MMIO registers to use pci_iomap, remember to dispose of the mapping with pci_iounmap (for symmetry). Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 00d8fb3e989f..eee88cfcb3aa 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -2082,7 +2082,7 @@ out_workqueue_free:
2082out_iomapfree: 2082out_iomapfree:
2083 io_mapping_free(dev_priv->mm.gtt_mapping); 2083 io_mapping_free(dev_priv->mm.gtt_mapping);
2084out_rmmap: 2084out_rmmap:
2085 iounmap(dev_priv->regs); 2085 pci_iounmap(dev->pdev, dev_priv->regs);
2086put_bridge: 2086put_bridge:
2087 pci_dev_put(dev_priv->bridge_dev); 2087 pci_dev_put(dev_priv->bridge_dev);
2088free_priv: 2088free_priv:
@@ -2168,7 +2168,7 @@ int i915_driver_unload(struct drm_device *dev)
2168 } 2168 }
2169 2169
2170 if (dev_priv->regs != NULL) 2170 if (dev_priv->regs != NULL)
2171 iounmap(dev_priv->regs); 2171 pci_iounmap(dev->pdev, dev_priv->regs);
2172 2172
2173 intel_teardown_gmbus(dev); 2173 intel_teardown_gmbus(dev);
2174 intel_teardown_mchbar(dev); 2174 intel_teardown_mchbar(dev);