From 8f75d8397f25805ba6b2aabe114566dce45a48b1 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 9 May 2008 10:08:36 +0800 Subject: [PATCH] destroy wq when unloading i915 We forgot to destroy it when modesetting is enabled, also fixed a typo. --- shared-core/i915_init.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c index 53574eb..5ec5cbe 100644 --- a/shared-core/i915_init.c +++ b/shared-core/i915_init.c @@ -255,7 +255,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) DRM_DEBUG("Enabled hardware status page\n"); dev_priv->wq = create_singlethread_workqueue("i915"); - if (dev_priv == 0) { + if (dev_priv->wq == 0) { DRM_DEBUG("Error\n"); } @@ -284,6 +284,7 @@ int i915_driver_unload(struct drm_device *dev) if (drm_core_check_feature(dev, DRIVER_MODESET)) { drm_irq_uninstall(dev); intel_modeset_cleanup(dev); + destroy_workqueue(dev_priv->wq); } #if 0 -- 1.5.0.5