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
Unified · Split
| @@ -827,7 +827,8 @@ static int hid_scan_report(struct hid_device *hid) · 826 unmodified lines | |||
| 827 | * hid-rmi should take care of them, | 827 | * hid-rmi should take care of them, |
| 828 | * not hid-generic | 828 | * not hid-generic |
| 829 | */ | 829 | */ |
| 830 | hid->group = HID_GROUP_RMI; | 830 | if (IS_ENABLED(CONFIG_HID_RMI)) |
| 831 | hid->group = HID_GROUP_RMI; | ||
| 831 | break; | 832 | break; |
| 832 | } | 833 | } |
| 833 | 834 | ||