[S390] cio: allow setting not-operational devices offline

Accept a request for setting a not-operational device offline.
This way, users can remove devices from Linux which would otherwise
remain unusable until reboot.

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

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 6a9ac85065ed4c0e80f10912d9ed13a1ff538fd2..9af864f615b081e7fbef11f9eaf15dacff9fd8a7 100644 (file)
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -529,11 +529,10 @@ static ssize_t online_store (struct device *dev, struct device_attribute *attr,
        int force, ret;
        unsigned long i;
 
-       if ((cdev->private->state != DEV_STATE_OFFLINE &&
-            cdev->private->state != DEV_STATE_ONLINE &&
-            cdev->private->state != DEV_STATE_BOXED &&
-            cdev->private->state != DEV_STATE_DISCONNECTED) ||
-           atomic_cmpxchg(&cdev->private->onoff, 0, 1) != 0)
+       if (!dev_fsm_final_state(cdev) &&
+           cdev->private->state != DEV_STATE_DISCONNECTED)
+               return -EAGAIN;
+       if (atomic_cmpxchg(&cdev->private->onoff, 0, 1) != 0)
                return -EAGAIN;
 
        if (cdev->drv && !try_module_get(cdev->drv->owner)) {