]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[S390] cio: ccw_device_online_store return -EINVAL in case of missing driver
authorSebastian Ott <sebott@linux.vnet.ibm.com>
Mon, 9 Aug 2010 16:12:52 +0000 (18:12 +0200)
committerMartin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com>
Mon, 9 Aug 2010 16:12:53 +0000 (18:12 +0200)
If no driver is attached to a device or the driver provides no
set_online/set_offline function, setting this device online/offline
via its sysfs online attribute will silently fail but return success.

This patch changes the behavior to return -EINVAL in those cases.

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

index 75acec3b2d6b6416a42b723e43cb017cda02136d..51bd3687d163fa3dfcce9454211aaa1ad654a328 100644 (file)
@@ -487,9 +487,11 @@ static int online_store_handle_offline(struct ccw_device *cdev)
                spin_lock_irq(cdev->ccwlock);
                ccw_device_sched_todo(cdev, CDEV_TODO_UNREG_EVAL);
                spin_unlock_irq(cdev->ccwlock);
-       } else if (cdev->online && cdev->drv && cdev->drv->set_offline)
+               return 0;
+       }
+       if (cdev->drv && cdev->drv->set_offline)
                return ccw_device_set_offline(cdev);
-       return 0;
+       return -EINVAL;
 }
 
 static int online_store_recog_and_online(struct ccw_device *cdev)
@@ -506,8 +508,8 @@ static int online_store_recog_and_online(struct ccw_device *cdev)
                        return -EAGAIN;
        }
        if (cdev->drv && cdev->drv->set_online)
-               ccw_device_set_online(cdev);
-       return 0;
+               return ccw_device_set_online(cdev);
+       return -EINVAL;
 }
 
 static int online_store_handle_online(struct ccw_device *cdev, int force)