mfd: cros_ec_dev: Return number of bytes read with CROS_EC_DEV_IOCRDMEM
authorGuenter Roeck <linux@roeck-us.net>
Wed, 6 Feb 2019 17:39:59 +0000 (18:39 +0100)
committerLee Jones <lee.jones@linaro.org>
Thu, 7 Feb 2019 10:44:24 +0000 (10:44 +0000)
While ioctls normally return a negative error or 0 on success, this is not
the case for CROS_EC_DEV_IOCXCMD in the cros_ec driver, which returns the
number of bytes read instead. However, CROS_EC_DEV_IOCRDMEM in the same
driver does not return the number of byte read on success. This is both
inconsistent and problematic, since the amount of returned data can be
dynamic. Have it return the number of data bytes for consistency.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: Benson Leung <bleung@chromium.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/cros_ec_dev.c

index ed809fc..d275dea 100644 (file)
@@ -224,7 +224,7 @@ static long ec_device_ioctl_readmem(struct cros_ec_dev *ec, void __user *arg)
        if (copy_to_user((void __user *)arg, &s_mem, sizeof(s_mem)))
                return -EFAULT;
 
-       return 0;
+       return num;
 }
 
 static long ec_device_ioctl(struct file *filp, unsigned int cmd,