[PATCH] platform: chrome: cros_ec_dev - Return number of bytes read with CROS_EC_DEV_IOCRDMEM

From	Guenter Roeck <linux@roeck-us.net>
Newsgroups	linux.kernel
Subject	[PATCH] platform: chrome: cros_ec_dev - Return number of bytes read with CROS_EC_DEV_IOCRDMEM
Date	2016-04-05 21:20 +0200
Message-ID	<rkEG5-lM-7@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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.

Cc: Gwendal Grignou <gwendal@chromium.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 drivers/platform/chrome/cros_ec_dev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/chrome/cros_ec_dev.c b/drivers/platform/chrome/cros_ec_dev.c
index d45cd254ed1c..6c45e0f5ba7b 100644
--- a/drivers/platform/chrome/cros_ec_dev.c
+++ b/drivers/platform/chrome/cros_ec_dev.c
@@ -181,7 +181,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,
-- 
2.5.0

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] platform: chrome: cros_ec_dev - Return number of bytes read with CROS_EC_DEV_IOCRDMEM Guenter Roeck <linux@roeck-us.net> - 2016-04-05 21:20 +0200

csiph-web