---

yaml
---
r: 173239
b: refs/heads/master
c: 350e912
h: refs/heads/master
i:
  173237: 049ad05
  173235: 137d5f5
  173231: 0f0f8c2
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9679baaf85b6e4dc662160bbbca344287ea6580d
+refs/heads/master: 350e91207bc9c6a464c22b9e0e30d21dfc07efe3

trunk/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)) {