From 8c976a47525a546141f4cdf6855345db4889af27 Mon Sep 17 00:00:00 2001
From: Stefan Bader <shbader@de.ibm.com>
Date: Thu, 27 Apr 2006 18:40:04 -0700
Subject: [PATCH] --- yaml --- r: 26289 b: refs/heads/master c:
 6dcfca78d4c036c9d012f913e2a622aae218827f h: refs/heads/master i:   26287:
 4b77b4626d9dc1ad0ee3c5671a6075e9cd5a3e25 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/s390/cio/chsc.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fcf8ce2c53e5..afbda8622fa3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 329b785bcee5d001f97a33bdb80de014bb5020b0
+refs/heads/master: 6dcfca78d4c036c9d012f913e2a622aae218827f
diff --git a/trunk/drivers/s390/cio/chsc.c b/trunk/drivers/s390/cio/chsc.c
index daedb00a4346..72187e54dcac 100644
--- a/trunk/drivers/s390/cio/chsc.c
+++ b/trunk/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 &