Browse Source

HID: rmi: Handle all Synaptics touchpads using hid-rmi

With the addition of HID and F12 support in the synaptics-rmi4 driver
touchpads which had been using the hid-multitouch driver can now
be support by the synaptics-rmi4 via hid-rmi. The advantage is that
additional data can be reported from the RMI registers which is not
available in the Microsoft Precision Touchpad collection.

Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Andrew Duggan 9 years ago
parent
commit
279967a65b
1 changed files with 2 additions and 1 deletions
  1. 2 1
      drivers/hid/hid-core.c

+ 2 - 1
drivers/hid/hid-core.c

@@ -826,7 +826,8 @@ static int hid_scan_report(struct hid_device *hid)
 		hid->group = HID_GROUP_WACOM;
 		hid->group = HID_GROUP_WACOM;
 		break;
 		break;
 	case USB_VENDOR_ID_SYNAPTICS:
 	case USB_VENDOR_ID_SYNAPTICS:
-		if (hid->group == HID_GROUP_GENERIC)
+		if (hid->group == HID_GROUP_GENERIC ||
+		    hid->group == HID_GROUP_MULTITOUCH_WIN_8)
 			if ((parser->scan_flags & HID_SCAN_FLAG_VENDOR_SPECIFIC)
 			if ((parser->scan_flags & HID_SCAN_FLAG_VENDOR_SPECIFIC)
 			    && (parser->scan_flags & HID_SCAN_FLAG_GD_POINTER))
 			    && (parser->scan_flags & HID_SCAN_FLAG_GD_POINTER))
 				/*
 				/*