diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-21 20:28:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-21 20:28:25 -0500 |
| commit | 81bbef23db51c0b450d90607fbbc2ad80ee0d43f (patch) | |
| tree | 763e991b31dbf83ff53cf964e8b8c402069e3754 /drivers/hid | |
| parent | 79f4d1d5c0d7d115b5a693a5bb369e69efb7e7a5 (diff) | |
| parent | 2fa299a917adb2db2d486b9e4a3072865ce70a03 (diff) | |
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
Diffstat (limited to 'drivers/hid')
| -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) | |||
| 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 | ||