diff options
| author | Peter Oberparleiter <peter.oberparleiter@de.ibm.com> | 2009-12-07 14:51:28 +0300 |
|---|---|---|
| committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2009-12-07 14:51:31 +0300 |
| commit | 350e91207bc9c6a464c22b9e0e30d21dfc07efe3 (patch) | |
| tree | 537c4ef8acd05d8a5e1c9e18b0b3f902d940f0f7 /drivers/s390/cio/device.c | |
| parent | 9679baaf85b6e4dc662160bbbca344287ea6580d (diff) | |
| download | linux-350e91207bc9c6a464c22b9e0e30d21dfc07efe3.tar.xz | |
[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>
Diffstat (limited to 'drivers/s390/cio/device.c')
| -rw-r--r-- | drivers/s390/cio/device.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 6a9ac85065ed..9af864f615b0 100644 --- 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)) { |