---

yaml --- r: 262562 b: refs/heads/master c: e1c44ac h: refs/heads/master v: v3
git-mirror · Aug 4, 2011 · 197ea9a · 197ea9a
1 parent 49c6a1d
commit 197ea9a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 816985d4f96cda5159b6b65f3442964725030ae9
+refs/heads/master: e1c44acc8cabda6b38864f25e809b306c4d2d790
diff --git a/trunk/drivers/gpu/drm/drm_irq.c b/trunk/drivers/gpu/drm/drm_irq.c
@@ -368,6 +368,9 @@ int drm_irq_install(struct drm_device *dev)
 		mutex_lock(&dev->struct_mutex);
 		dev->irq_enabled = 0;
 		mutex_unlock(&dev->struct_mutex);
+		if (!drm_core_check_feature(dev, DRIVER_MODESET))
+			vga_client_register(dev->pdev, NULL, NULL, NULL);
+		free_irq(drm_dev_to_irq(dev), dev);
 	}
 
 	return ret;