summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux-core/intel_lvds.c3
-rw-r--r--shared-core/i915_init.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/linux-core/intel_lvds.c b/linux-core/intel_lvds.c
index 8ecb204c..ec693275 100644
--- a/linux-core/intel_lvds.c
+++ b/linux-core/intel_lvds.c
@@ -314,7 +314,8 @@ out:
static void intel_lvds_destroy(struct drm_output *output)
{
- drm_output_destroy(output);
+ if (output->driver_private)
+ kfree(output->driver_private);
}
static const struct drm_output_funcs intel_lvds_output_funcs = {
diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index d9fb485b..43c535d2 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -179,7 +179,7 @@ int i915_driver_unload(drm_device_t *dev)
struct drm_framebuffer *fb;
/* FIXME: remove framebuffer */
- //intel_modeset_cleanup(dev);
+ intel_modeset_cleanup(dev);
drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
dev->dev_private = NULL;