From: Stefan Bader <shbader@de.ibm.com>
Date: Fri, 28 Apr 2006 01:40:04 +0000 (-0700)
Subject: [PATCH] s390: enable interrupts on error path
X-Git-Tag: v2.6.17-rc4~123
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6dcfca78d4c036c9d012f913e2a622aae218827f;p=linux-2.6-omap-h63xx.git

[PATCH] s390: enable interrupts on error path

Interrupts can stay disabled if an error occurred in _chp_add().  Use
spin_unlock_irq on the error paths to reenable interrupts.

Signed-off-by: Stefan Bader <shbader@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index daedb00a434..72187e54dca 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -635,13 +635,13 @@ __chp_add(struct subchannel_id schid, void *data)
 		if (sch->schib.pmcw.chpid[i] == chp->id) {
 			if (stsch(sch->schid, &sch->schib) != 0) {
 				/* Endgame. */
-				spin_unlock(&sch->lock);
+				spin_unlock_irq(&sch->lock);
 				return -ENXIO;
 			}
 			break;
 		}
 	if (i==8) {
-		spin_unlock(&sch->lock);
+		spin_unlock_irq(&sch->lock);
 		return 0;
 	}
 	sch->lpm = ((sch->schib.pmcw.pim &