From dfb2ff0dbdd86be8806034f30c9ac622160407c8 Mon Sep 17 00:00:00 2001 From: Sebastian Ott Date: Tue, 31 Mar 2009 19:16:06 +0200 Subject: [PATCH] --- yaml --- r: 139305 b: refs/heads/master c: b5cd99e6b002776c0e946f38292adbb0258b7983 h: refs/heads/master i: 139303: 6395194a01aef506f986dc771b48a3ed6555ca80 v: v3 --- [refs] | 2 +- trunk/drivers/s390/cio/device.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ec6407426d19..4283b657b35f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47593bfa1056d306fde067b28dd8617009be4121 +refs/heads/master: b5cd99e6b002776c0e946f38292adbb0258b7983 diff --git a/trunk/drivers/s390/cio/device.c b/trunk/drivers/s390/cio/device.c index 868f8c6b053a..e47aa3f04769 100644 --- a/trunk/drivers/s390/cio/device.c +++ b/trunk/drivers/s390/cio/device.c @@ -515,7 +515,11 @@ static ssize_t online_store (struct device *dev, struct device_attribute *attr, int force, ret; unsigned long i; - if (atomic_cmpxchg(&cdev->private->onoff, 0, 1) != 0) + 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) return -EAGAIN; if (cdev->drv && !try_module_get(cdev->drv->owner)) {