diff options
| author | Maximilian Luz <luzmaximilian@gmail.com> | 2021-10-21 15:09:03 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2021-10-22 10:54:51 +0200 |
| commit | dc0fd0acb6e0e8025a0a43ada54513b216254fac (patch) | |
| tree | f0b3437b1942bc92de81ba00f953288e49728a68 /drivers/hid/surface-hid | |
| parent | 4f042e40199ce8bac6bc2b853e81744ee4ea759c (diff) | |
| download | linux-dc0fd0acb6e0e8025a0a43ada54513b216254fac.tar.gz linux-dc0fd0acb6e0e8025a0a43ada54513b216254fac.tar.bz2 linux-dc0fd0acb6e0e8025a0a43ada54513b216254fac.zip | |
HID: surface-hid: Use correct event registry for managing HID events
Until now, we have only ever seen the REG-category registry being used
on devices addressed with target ID 2. In fact, we have only ever seen
Surface Aggregator Module (SAM) HID devices with target ID 2. For those
devices, the registry also has to be addressed with target ID 2.
Some devices, like the new Surface Laptop Studio, however, address their
HID devices on target ID 1. As a result of this, any target ID 2
commands time out. This includes event management commands addressed to
the target ID 2 REG-category registry. For these devices, the registry
has to be addressed via target ID 1 instead.
We therefore assume that the target ID of the registry to be used
depends on the target ID of the respective device. Implement this
accordingly.
Note that we currently allow the surface HID driver to only load against
devices with target ID 2, so these timeouts are not happening (yet).
This is just a preparation step before we allow the driver to load
against all target IDs.
Cc: stable@vger.kernel.org # 5.14+
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Link: https://lore.kernel.org/r/20211021130904.862610-3-luzmaximilian@gmail.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'drivers/hid/surface-hid')
| -rw-r--r-- | drivers/hid/surface-hid/surface_hid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/surface-hid/surface_hid.c b/drivers/hid/surface-hid/surface_hid.c index a3a70e4f3f6c..daa452367c0b 100644 --- a/drivers/hid/surface-hid/surface_hid.c +++ b/drivers/hid/surface-hid/surface_hid.c @@ -209,7 +209,7 @@ static int surface_hid_probe(struct ssam_device *sdev) shid->notif.base.priority = 1; shid->notif.base.fn = ssam_hid_event_fn; - shid->notif.event.reg = SSAM_EVENT_REGISTRY_REG; + shid->notif.event.reg = SSAM_EVENT_REGISTRY_REG(sdev->uid.target); shid->notif.event.id.target_category = sdev->uid.category; shid->notif.event.id.instance = sdev->uid.instance; shid->notif.event.mask = SSAM_EVENT_MASK_STRICT; |