From a4410f99d9d7adb8b001de17b401a39199b0f57e Mon Sep 17 00:00:00 2001
From: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Date: Tue, 9 Sep 2008 12:38:59 +0200
Subject: [PATCH] --- yaml --- r: 109732 b: refs/heads/master c:
 b301ea8c81b13123761772f344faf606c76ba174 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/s390/cio/device_fsm.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 90a6aed69ce6..e20c39031369 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c91ebe496120e05301465fff31094bfecf798e9f
+refs/heads/master: b301ea8c81b13123761772f344faf606c76ba174
diff --git a/trunk/drivers/s390/cio/device_fsm.c b/trunk/drivers/s390/cio/device_fsm.c
index 550508df952b..84cc9ea346db 100644
--- a/trunk/drivers/s390/cio/device_fsm.c
+++ b/trunk/drivers/s390/cio/device_fsm.c
@@ -658,6 +658,13 @@ ccw_device_offline(struct ccw_device *cdev)
 {
 	struct subchannel *sch;
 
+	/* Allow ccw_device_offline while disconnected. */
+	if (cdev->private->state == DEV_STATE_DISCONNECTED ||
+	    cdev->private->state == DEV_STATE_NOT_OPER) {
+		cdev->private->flags.donotify = 0;
+		ccw_device_done(cdev, DEV_STATE_NOT_OPER);
+		return 0;
+	}
 	if (ccw_device_is_orphan(cdev)) {
 		ccw_device_done(cdev, DEV_STATE_OFFLINE);
 		return 0;