summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-04-02 08:39:40 +0200
committerJens Axboe <jens.axboe@oracle.com>2010-04-02 08:39:40 +0200
commit61917bdaaf6bea4b885525cf63f65272914f6be2 (patch)
treee8b1fbbad686676ebc9a234e0e2de9d57e8488ea
parentcfq-iosched: Do not merge queues of BE and IDLE classes (diff)
downloadlinux-61917bdaaf6bea4b885525cf63f65272914f6be2.tar.xz
linux-61917bdaaf6bea4b885525cf63f65272914f6be2.zip
cciss: unlock on error path
We take the spin_lock again in fail_all_cmds() so we need to unlock here. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r--drivers/block/cciss.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 9e3af307aae1..eb5ff0531cfb 100644
--- a/drivers/block/cciss.c
+++ b/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;
}