From d5f40b81159bb2ef2b680cd6a6365a375de49251 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Fri, 4 Jun 2010 16:17:37 -0700
Subject: [PATCH] --- yaml --- r: 201131 b: refs/heads/master c:
 0d0659c78d7ea29ad6c3c538dcaae0227f31b9d2 h: refs/heads/master i:   201129:
 ce4281b050c1c7a2faa554ea375030db2eaa0658   201127:
 b6f7eb5957717a47052209869f99c982605231a8 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/sparc/kernel/sun4d_irq.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a89e72bab6a3..af6d0f83def5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fc251d9a6c9fb841b73f29dd73dcf91afe7883f
+refs/heads/master: 0d0659c78d7ea29ad6c3c538dcaae0227f31b9d2
diff --git a/trunk/arch/sparc/kernel/sun4d_irq.c b/trunk/arch/sparc/kernel/sun4d_irq.c
index ab036a72de5a..e11b4612dabb 100644
--- a/trunk/arch/sparc/kernel/sun4d_irq.c
+++ b/trunk/arch/sparc/kernel/sun4d_irq.c
@@ -183,7 +183,7 @@ void sun4d_free_irq(unsigned int irq, void *dev_id)
 		goto out_unlock;
 	}
 	
-	if (action && tmp)
+	if (tmp)
 		tmp->next = action->next;
 	else
 		*actionp = action->next;