Commit c91a7dee authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'chrome-platform-fixes-for-v6.11-rc2' of...

Merge tag 'chrome-platform-fixes-for-v6.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux

Pull chrome-platform fix from Tzung-Bi Shih:
 "Fix a race condition that sends multiple host commands at a time"

* tag 'chrome-platform-fixes-for-v6.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
  platform/chrome: cros_ec_proto: Lock device when updating MKBP version
parents 22f54687 df615907
...@@ -813,9 +813,11 @@ int cros_ec_get_next_event(struct cros_ec_device *ec_dev, ...@@ -813,9 +813,11 @@ int cros_ec_get_next_event(struct cros_ec_device *ec_dev,
if (ret == -ENOPROTOOPT) { if (ret == -ENOPROTOOPT) {
dev_dbg(ec_dev->dev, dev_dbg(ec_dev->dev,
"GET_NEXT_EVENT returned invalid version error.\n"); "GET_NEXT_EVENT returned invalid version error.\n");
mutex_lock(&ec_dev->lock);
ret = cros_ec_get_host_command_version_mask(ec_dev, ret = cros_ec_get_host_command_version_mask(ec_dev,
EC_CMD_GET_NEXT_EVENT, EC_CMD_GET_NEXT_EVENT,
&ver_mask); &ver_mask);
mutex_unlock(&ec_dev->lock);
if (ret < 0 || ver_mask == 0) if (ret < 0 || ver_mask == 0)
/* /*
* Do not change the MKBP supported version if we can't * Do not change the MKBP supported version if we can't
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment