diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-21 17:28:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-21 17:28:25 -0800 |
| commit | 81bbef23db51c0b450d90607fbbc2ad80ee0d43f (patch) | |
| tree | 763e991b31dbf83ff53cf964e8b8c402069e3754 | |
| parent | Merge branch 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata (diff) | |
| parent | HID: rmi: fallback to generic/multitouch if hid-rmi is not built (diff) | |
| download | linux-dev-81bbef23db51c0b450d90607fbbc2ad80ee0d43f.tar.xz linux-dev-81bbef23db51c0b450d90607fbbc2ad80ee0d43f.zip | |
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
| -rw-r--r-- | drivers/hid/hid-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 538ff697a4cf..e9e87d337446 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; } |