projects/linux·commit 2fa299a9

HID: rmi: fallback to generic/multitouch if hid-rmi is not built

2fa299a9 · Jiri Kosina <[email protected]> · 2017-02-22 01:13:52 +01:00

Commit 279967a65b32 ("HID: rmi: Handle all Synaptics touchpads using hid-rmi")
unconditionally switches over handling of all Synaptics touchpads to hid-rmi
(to make use of extended features of the HW); in case CONFIG_HID_RMI is
disabled though this renders the touchpad unusable, as the

	HID_DEVICE(HID_BUS_ANY, HID_GROUP_RMI, HID_ANY_ID, HID_ANY_ID)

match doesn't exist and generic/multitouch doesn't bind to it either (due
to hid group mismatch).

Fix this by switching over to hid-rmi only if it has been actually built.

Fixes: 279967a65b32 ("HID: rmi: Handle all Synaptics touchpads using hid-rmi")
Reported-by: Linus Torvalds <[email protected]>
Acked-by: Benjamin Tissoires <[email protected]>
Tested-by: Andrew Duggan <[email protected]>
Signed-off-by: Jiri Kosina <[email protected]>
Commit
2fa299a917adb2db2d486b9e4a3072865ce70a03
Parents
27a67e0f

Changes

1 files changed · +2 −1

FileStatusAddDelContent
drivers/hid/hid-core.cmodified+2−1View file

drivers/hid/hid-core.c

View file
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 538ff69..e9e87d3 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -827,7 +827,8 @@ static int hid_scan_report(struct hid_device *hid)
* hid-rmi should take care of them,
* not hid-generic
*/
- hid->group = HID_GROUP_RMI;
+ if (IS_ENABLED(CONFIG_HID_RMI))
+ hid->group = HID_GROUP_RMI;
break;
}