aboutsummaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2008-06-06 12:58:41 -0700
committerKeith Packard <keithp@keithp.com>2008-06-06 13:00:46 -0700
commita708106c77f74f146722fba35eae772fb554ee9a (patch)
treef0f5befb4c51dc04b47dcf6f3b019d66d1ca84a8 /shared-core
parent56a96841d01d112d7d4adfebb572016398551ba8 (diff)
[intel] free the hardware status page at driver_unload
This goes with the other hardware status page patch.
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/i915_dma.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index 6e188f08..c0ddeae0 100644
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -1103,8 +1103,9 @@ int i915_driver_unload(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = dev->dev_private;
- if (dev_priv->mmio_map)
- drm_rmmap(dev, dev_priv->mmio_map);
+ i915_free_hardware_status(dev);
+
+ drm_rmmap(dev, dev_priv->mmio_map);
drm_free(dev->dev_private, sizeof(drm_i915_private_t),
DRM_MEM_DRIVER);
@@ -1113,8 +1114,6 @@ int i915_driver_unload(struct drm_device *dev)
intel_fini_chipset_flush_compat(dev);
#endif
#endif
- i915_free_hardware_status(dev);
-
return 0;
}