summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaximilian Luz <luzmaximilian@gmail.com>2021-06-03 02:06:36 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-06-16 12:05:15 +0200
commit63345c030e715c91d39e696243922a0453918fad (patch)
tree2f939f7c953d804b7999ab2efa3bbb6744e46a30
parent322fd1cfe16903c17cf36f8770d7310151694065 (diff)
downloadlinux-63345c030e715c91d39e696243922a0453918fad.tar.gz
linux-63345c030e715c91d39e696243922a0453918fad.tar.bz2
linux-63345c030e715c91d39e696243922a0453918fad.zip
platform/surface: aggregator: Fix event disable function
commit b430e1d65ef6eeee42c4e53028f8dfcc6abc728b upstream. Disabling events silently fails due to the wrong command ID being used. Instead of the command ID for the disable call, the command ID for the enable call was being used. This causes the disable call to enable the event instead. As the event is already enabled when we call this function, the EC silently drops this command and does nothing. Use the correct command ID for disabling the event to fix this. Fixes: c167b9c7e3d6 ("platform/surface: Add Surface Aggregator subsystem") Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com> Link: https://lore.kernel.org/r/20210603000636.568846-1-luzmaximilian@gmail.com Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/platform/surface/aggregator/controller.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/surface/aggregator/controller.c b/drivers/platform/surface/aggregator/controller.c
index 89761d3e1a47..d68d51fb24ff 100644
--- a/drivers/platform/surface/aggregator/controller.c
+++ b/drivers/platform/surface/aggregator/controller.c
@@ -1907,7 +1907,7 @@ static int ssam_ssh_event_disable(struct ssam_controller *ctrl,
{
int status;
- status = __ssam_ssh_event_request(ctrl, reg, reg.cid_enable, id, flags);
+ status = __ssam_ssh_event_request(ctrl, reg, reg.cid_disable, id, flags);
if (status < 0 && status != -EINVAL) {
ssam_err(ctrl,