diff options
author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2012-11-09 14:33:06 +0100 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-11-23 11:14:34 +0100 |
commit | cff971026d7c19f67f9312e753bb06f18b6cdae7 (patch) | |
tree | 71f7dd867568fd3e8681a2eea8af060565ab8d51 /drivers | |
parent | ce6a04ac1b759beafc88dbc443ae5da867579eeb (diff) | |
download | linux-stable-cff971026d7c19f67f9312e753bb06f18b6cdae7.tar.gz linux-stable-cff971026d7c19f67f9312e753bb06f18b6cdae7.tar.bz2 linux-stable-cff971026d7c19f67f9312e753bb06f18b6cdae7.zip |
s390/ccwgroup: set_online return error when already online
Return -EINVAL if set_{on,off}line is called for already {on,off}line
devices. Also return -EINVAL for drivers which do not provide a callback
for set_{on,off}line. This behaviour is now consistent with the one for
ccw devices.
Reported-by: Stefan Raspl <raspl@linux.vnet.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Acked-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/s390/cio/ccwgroup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c index 731470e68493..9c8e117c7d3a 100644 --- a/drivers/s390/cio/ccwgroup.c +++ b/drivers/s390/cio/ccwgroup.c @@ -68,7 +68,7 @@ static void __ccwgroup_remove_cdev_refs(struct ccwgroup_device *gdev) static int ccwgroup_set_online(struct ccwgroup_device *gdev) { struct ccwgroup_driver *gdrv = to_ccwgroupdrv(gdev->dev.driver); - int ret = 0; + int ret = -EINVAL; if (atomic_cmpxchg(&gdev->onoff, 0, 1) != 0) return -EAGAIN; @@ -88,7 +88,7 @@ out: static int ccwgroup_set_offline(struct ccwgroup_device *gdev) { struct ccwgroup_driver *gdrv = to_ccwgroupdrv(gdev->dev.driver); - int ret = 0; + int ret = -EINVAL; if (atomic_cmpxchg(&gdev->onoff, 0, 1) != 0) return -EAGAIN; |