aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorMaximilian Luz <luzmaximilian@gmail.com>2021-06-03 02:06:36 +0200
committerHans de Goede <hdegoede@redhat.com>2021-06-16 17:47:51 +0200
commit6cbaee2e109ed0f7327a2d3cbb412f36fd8873e0 (patch)
tree0952c8de0b23e8a39dd6857ed7c67321f0eeb634 /drivers/platform
parentplatform/x86: toshiba_acpi: Fix missing error code in toshiba_acpi_setup_keyboard() (diff)
downloadlinux-dev-6cbaee2e109ed0f7327a2d3cbb412f36fd8873e0.tar.xz
linux-dev-6cbaee2e109ed0f7327a2d3cbb412f36fd8873e0.zip
platform/surface: aggregator: Fix event disable function
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>
Diffstat (limited to 'drivers/platform')
-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 8a70df60142c..a06964aa96e7 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,