[S390] cio: ccw group online store - report rcs to the caller.
authorSebastian Ott <sebott@linux.vnet.ibm.com>
Thu, 26 Mar 2009 14:24:13 +0000 (15:24 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Thu, 26 Mar 2009 14:24:15 +0000 (15:24 +0100)
In case the ccw group driver refuses to set a device [on|off]line,
we should transmit the return code to the caller.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
drivers/s390/cio/ccwgroup.c

index 918e6fce2573fcd9fe18e61a41c6d26fd3872c56..ec2742813bf2ffd3177480b67bad6ffdbcb2ae98 100644 (file)
@@ -391,27 +391,28 @@ ccwgroup_online_store (struct device *dev, struct device_attribute *attr, const
        unsigned long value;
        int ret;
 
-       gdev = to_ccwgroupdev(dev);
        if (!dev->driver)
-               return count;
+               return -ENODEV;
+
+       gdev = to_ccwgroupdev(dev);
+       gdrv = to_ccwgroupdrv(dev->driver);
 
-       gdrv = to_ccwgroupdrv (gdev->dev.driver);
        if (!try_module_get(gdrv->owner))
                return -EINVAL;
 
        ret = strict_strtoul(buf, 0, &value);
        if (ret)
                goto out;
-       ret = count;
+
        if (value == 1)
-               ccwgroup_set_online(gdev);
+               ret = ccwgroup_set_online(gdev);
        else if (value == 0)
-               ccwgroup_set_offline(gdev);
+               ret = ccwgroup_set_offline(gdev);
        else
                ret = -EINVAL;
 out:
        module_put(gdrv->owner);
-       return ret;
+       return (ret == 0) ? count : ret;
 }
 
 static ssize_t