From d40e808c8f643732ffec278a18cfb9d2f765dee2 Mon Sep 17 00:00:00 2001
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Mon, 25 Oct 2010 16:10:26 +0200
Subject: [PATCH] --- yaml --- r: 216757 b: refs/heads/master c:
 74b6127e6c35abf06364468636dd261850639f8b h: refs/heads/master i:   216755:
 935fd73c6b8884ecba32e735c9d559857db70f68 v: v3

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

diff --git a/[refs] b/[refs]
index 5080da997697..ed8d38077a38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2777077aa1f6f8a7c76b83f240975289a9fb894
+refs/heads/master: 74b6127e6c35abf06364468636dd261850639f8b
diff --git a/trunk/drivers/s390/cio/device.c b/trunk/drivers/s390/cio/device.c
index 51bd3687d163..07b1a074beaf 100644
--- a/trunk/drivers/s390/cio/device.c
+++ b/trunk/drivers/s390/cio/device.c
@@ -1468,9 +1468,13 @@ static int io_subchannel_sch_event(struct subchannel *sch, int process)
 			goto out;
 		break;
 	case IO_SCH_UNREG_ATTACH:
+		if (cdev->private->flags.resuming) {
+			/* Device will be handled later. */
+			rc = 0;
+			goto out;
+		}
 		/* Unregister ccw device. */
-		if (!cdev->private->flags.resuming)
-			ccw_device_unregister(cdev);
+		ccw_device_unregister(cdev);
 		break;
 	default:
 		break;