openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

platform/input: cros_ec: Replace -ENOTSUPP with -ENOPROTOOPT 

-ENOTSUPP is not a SUSV4 error code and should not be used. Use
-ENOPROTOOPT instead to report EC_RES_INVALID_VERSION responses
from the EC. This matches match the NFS response for unsupported
protocol versions.

Cc: Gwendal Grignou <gwendal@chromium.org>
Cc: Yu-Hsuan Hsu <yuhsuan@chromium.org>
Cc: Prashant Malani <pmalani@chromium.org>
Cc: Brian Norris <briannorris@chromium.org>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
This commit is contained in:
Guenter Roeck 2020-08-22 08:08:55 -07:00 committed by Enric Balletbo i Serra
parent d509f8a71a
commit b4e452b5e9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/input/keyboard/cros_ec_keyb.c
View File

@ -348,7 +348,7 @@ static int cros_ec_keyb_info(struct cros_ec_device *ec_dev,
params->event_type = event_type; params->event_type = event_type;
ret = cros_ec_cmd_xfer_status(ec_dev, msg); ret = cros_ec_cmd_xfer_status(ec_dev, msg);
if (ret == -ENOTSUPP) { if (ret == -ENOPROTOOPT) {
/* With older ECs we just return 0 for everything */ /* With older ECs we just return 0 for everything */
memset(result, 0, result_size); memset(result, 0, result_size);
ret = 0; ret = 0;

4
drivers/platform/chrome/cros_ec_proto.c
View File

@ -579,7 +579,7 @@ static int cros_ec_cmd_xfer(struct cros_ec_device *ec_dev,
* *
* Return: * Return:
* >=0 - The number of bytes transferred * >=0 - The number of bytes transferred
* -ENOTSUPP - Operation not supported * -ENOPROTOOPT - Operation not supported
* -EPROTO - Protocol error * -EPROTO - Protocol error
*/ */
int cros_ec_cmd_xfer_status(struct cros_ec_device *ec_dev, int cros_ec_cmd_xfer_status(struct cros_ec_device *ec_dev,
@ -593,7 +593,7 @@ int cros_ec_cmd_xfer_status(struct cros_ec_device *ec_dev,
} else if (msg->result == EC_RES_INVALID_VERSION) { } else if (msg->result == EC_RES_INVALID_VERSION) {
dev_dbg(ec_dev->dev, "Command invalid version (err:%d)\n", dev_dbg(ec_dev->dev, "Command invalid version (err:%d)\n",
msg->result); msg->result);
return -ENOTSUPP; return -ENOPROTOOPT;
} else if (msg->result != EC_RES_SUCCESS) { } else if (msg->result != EC_RES_SUCCESS) {
dev_dbg(ec_dev->dev, "Command result (err: %d)\n", msg->result); dev_dbg(ec_dev->dev, "Command result (err: %d)\n", msg->result);
return -EPROTO; return -EPROTO;