commit 102e835d5152e4299c1d150d6481b9bd47095998
author Peter Oberparleiter <peter.oberparleiter@de.ibm.com> Tue Oct 06 10:34:03 2009 +0200
committer Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> Tue Oct 06 10:35:07 2009 +0200
tree f25407a48a9848c6cd80ced1a55c679b7e2ac9bf
parent 6afcc775d9d66fe550fad6c579f78b3c3da895b8

[S390] cio: allow setting boxed devices offline

Allow users to set boxed devices offline. After setting them
offline, the device state will still be boxed.

Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

drivers/s390/cio/device_fsm.c

diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 3b0f408..b9613d7 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -687,6 +687,10 @@
 		ccw_device_done(cdev, DEV_STATE_NOT_OPER);
 		return 0;
 	}
+	if (cdev->private->state == DEV_STATE_BOXED) {
+		ccw_device_done(cdev, DEV_STATE_BOXED);
+		return 0;
+	}
 	if (ccw_device_is_orphan(cdev)) {
 		ccw_device_done(cdev, DEV_STATE_OFFLINE);
 		return 0;