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

81bbef23 · Linus Torvalds <[email protected]> · 2017-02-21 17:28:25 -08:00

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

Commit: 81bbef23db51c0b450d90607fbbc2ad80ee0d43f
Parents: 79f4d1d5 · 2fa299a9

Merge commit. Changes below are compared with the first parent: 79f4d1d5.

Changes

1 files changed · +2 −1

File	Status	Add	Del	Content
drivers/hid/hid-core.c	modified	+2	−1	View 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;
 	}
 