From dce34421947d1828ff76c001281107e937e307d4 Mon Sep 17 00:00:00 2001 From: Hong Liu Date: Fri, 9 May 2008 10:08:36 +0800 Subject: fixup i915 workqueue handling when modeset=1 Fixup workqueue creation error handling and make sure we destroy the queue on unload. --- shared-core/i915_init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'shared-core') diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c index 8824b959..b9e7e17b 100644 --- a/shared-core/i915_init.c +++ b/shared-core/i915_init.c @@ -256,7 +256,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"); } @@ -291,6 +291,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 -- cgit v1.2.3