From 1127b8bcdeddd7d315ff13d5aedac6df1569201d Mon Sep 17 00:00:00 2001
From: Hoang-Nam Nguyen <hnguyen@linux.vnet.ibm.com>
Date: Fri, 19 Jan 2007 22:50:10 +0100
Subject: [PATCH] --- yaml --- r: 45752 b: refs/heads/master c:
 cea9ea67e9927da18af89b49bd949a8d65ba1b15 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/infiniband/hw/ehca/ehca_irq.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3776b05431be..3b066fb65a63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce29d72cc737df3573854a4719f00385adf1c9a6
+refs/heads/master: cea9ea67e9927da18af89b49bd949a8d65ba1b15
diff --git a/trunk/drivers/infiniband/hw/ehca/ehca_irq.c b/trunk/drivers/infiniband/hw/ehca/ehca_irq.c
index e7209afb4250..c069be8cbcb2 100644
--- a/trunk/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/trunk/drivers/infiniband/hw/ehca/ehca_irq.c
@@ -440,7 +440,8 @@ void ehca_tasklet_eq(unsigned long data)
 					cq = idr_find(&ehca_cq_idr, token);
 
 					if (cq == NULL) {
-						spin_unlock(&ehca_cq_idr_lock);
+						spin_unlock_irqrestore(&ehca_cq_idr_lock,
+								       flags);
 						break;
 					}