---

yaml --- r: 189732 b: refs/heads/master c: 61917bd h: refs/heads/master v: v3
git-mirror · Apr 2, 2010 · 8067f6e · 8067f6e
1 parent 82a03b7
commit 8067f6e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;
 				}