From 4a2c9891419e91aa46b360881e068b2d06ba12fd Mon Sep 17 00:00:00 2001
From: Jan Glauber <jang@linux.vnet.ibm.com>
Date: Thu, 26 Mar 2009 15:24:25 +0100
Subject: [PATCH] --- yaml --- r: 135628 b: refs/heads/master c:
 e4c14e2085cd32f61e9ffc47d5b20d4f5f7639f3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 92c2e6c5d13c..82b60426738d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b454740246d14b0a9c00220696f9020eaa15ca12
+refs/heads/master: e4c14e2085cd32f61e9ffc47d5b20d4f5f7639f3
diff --git a/trunk/drivers/s390/cio/qdio_main.c b/trunk/drivers/s390/cio/qdio_main.c
index 5100996201d1..fa902703996c 100644
--- a/trunk/drivers/s390/cio/qdio_main.c
+++ b/trunk/drivers/s390/cio/qdio_main.c
@@ -1404,9 +1404,8 @@ int qdio_activate(struct ccw_device *cdev)
 	switch (irq_ptr->state) {
 	case QDIO_IRQ_STATE_STOPPED:
 	case QDIO_IRQ_STATE_ERR:
-		mutex_unlock(&irq_ptr->setup_mutex);
-		qdio_shutdown(cdev, QDIO_FLAG_CLEANUP_USING_CLEAR);
-		return -EIO;
+		rc = -EIO;
+		break;
 	default:
 		qdio_set_state(irq_ptr, QDIO_IRQ_STATE_ACTIVE);
 		rc = 0;