From f90b5931e7587ec11f21d309699b4fcfddac70a2 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <jglisse@redhat.com>
Date: Wed, 9 Sep 2009 22:23:07 +0200
Subject: [PATCH] --- yaml --- r: 163993 b: refs/heads/master c:
 a513c184d99fe10e7b20771ef86f5f807769318f h: refs/heads/master i:   163991:
 fe51c931b5238f4ef1960255d3015df1f45e3b06 v: v3

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

diff --git a/[refs] b/[refs]
index e4c407a6b6d1..2919b810d97b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 905b68223be18937159a29b354e6a332952ff952
+refs/heads/master: a513c184d99fe10e7b20771ef86f5f807769318f
diff --git a/trunk/drivers/gpu/drm/radeon/r100.c b/trunk/drivers/gpu/drm/radeon/r100.c
index 4e1c55162ccb..4dd5ca50c0c5 100644
--- a/trunk/drivers/gpu/drm/radeon/r100.c
+++ b/trunk/drivers/gpu/drm/radeon/r100.c
@@ -319,6 +319,9 @@ int r100_irq_process(struct radeon_device *rdev)
 	if (!status) {
 		return IRQ_NONE;
 	}
+	if (rdev->shutdown) {
+		return IRQ_NONE;
+	}
 	while (status) {
 		/* SW interrupt */
 		if (status & RADEON_SW_INT_TEST) {