Commit 81bbef23 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Pull HID fix from Jiri Kosina:
 "Regression fix for HID_RMI-driven synaptics touchpads in
  !CONFIG_HID_RMI cases"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: rmi: fallback to generic/multitouch if hid-rmi is not built
parents 79f4d1d5 2fa299a9
...@@ -827,6 +827,7 @@ static int hid_scan_report(struct hid_device *hid) ...@@ -827,6 +827,7 @@ static int hid_scan_report(struct hid_device *hid)
* hid-rmi should take care of them, * hid-rmi should take care of them,
* not hid-generic * not hid-generic
*/ */
if (IS_ENABLED(CONFIG_HID_RMI))
hid->group = HID_GROUP_RMI; hid->group = HID_GROUP_RMI;
break; break;
} }
......
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