From: Guenter Roeck Date: Wed, 6 Feb 2019 17:39:59 +0000 (+0100) Subject: mfd: cros_ec_dev: Return number of bytes read with CROS_EC_DEV_IOCRDMEM X-Git-Tag: v5.1-rc1~103^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1778e5819a9784b5551cf8f7abd66571c1239e2;p=thirdparty%2Fkernel%2Flinux.git mfd: cros_ec_dev: Return number of bytes read with CROS_EC_DEV_IOCRDMEM 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 Signed-off-by: Enric Balletbo i Serra Reviewed-by: Benson Leung Signed-off-by: Lee Jones --- diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c index ed809fc97df89..d275deaecb125 100644 --- a/drivers/mfd/cros_ec_dev.c +++ b/drivers/mfd/cros_ec_dev.c @@ -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,