From 197ea9a6bb2b6d7b908680ba18e35fa08012e9cd Mon Sep 17 00:00:00 2001
From: Joonyoung Shim <jy0922.shim@samsung.com>
Date: Thu, 4 Aug 2011 05:41:00 +0000
Subject: [PATCH] --- yaml --- r: 262562 b: refs/heads/master c:
 e1c44acc8cabda6b38864f25e809b306c4d2d790 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/gpu/drm/drm_irq.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4c2c2d96de70..27afce2787b5 100644
--- 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
index 2022a5c966bb..9be574fbcc2f 100644
--- 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;