From 8067f6eb6cd00799c799cff0315abeebbc76198b Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Fri, 2 Apr 2010 08:39:40 +0200
Subject: [PATCH] --- yaml --- r: 189732 b: refs/heads/master c:
 61917bdaaf6bea4b885525cf63f65272914f6be2 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/block/cciss.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1acc50776f4b..44720221344a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39c01b219fd30c74869b6fc8749f7900f04e9ef6
+refs/heads/master: 61917bdaaf6bea4b885525cf63f65272914f6be2
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 9e3af307aae1..eb5ff0531cfb 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -3341,6 +3341,7 @@ static irqreturn_t do_cciss_intr(int irq, void *dev_id)
 					printk(KERN_WARNING
 					       "cciss: controller cciss%d failed, stopping.\n",
 					       h->ctlr);
+					spin_unlock_irqrestore(CCISS_LOCK(h->ctlr), flags);
 					fail_all_cmds(h->ctlr);
 					return IRQ_HANDLED;
 				}