Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
"Two last-minute regression fixes for Wacom driver from Jason Gerecke"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: wacom: Override incorrect logical maximum contact identifier
HID: wacom: Treat HID_DG_TOOLSERIALNUMBER as unsigned
+11
-1
+11
-1
drivers/hid/wacom_wac.c
+11
-1
drivers/hid/wacom_wac.c
···
2006
2006
return;
2007
2007
case HID_DG_TOOLSERIALNUMBER:
2008
2008
wacom_wac->serial[0] = (wacom_wac->serial[0] & ~0xFFFFFFFFULL);
2009
-
wacom_wac->serial[0] |= value;
2009
+
wacom_wac->serial[0] |= (__u32)value;
2010
2010
return;
2011
2011
case WACOM_HID_WD_SENSE:
2012
2012
wacom_wac->hid_data.sense_state = value;
···
2175
2175
wacom_wac->hid_data.cc_report = field->report->id;
2176
2176
wacom_wac->hid_data.cc_index = field->index;
2177
2177
wacom_wac->hid_data.cc_value_index = usage->usage_index;
2178
+
break;
2179
+
case HID_DG_CONTACTID:
2180
+
if ((field->logical_maximum - field->logical_minimum) < touch_max) {
2181
+
/*
2182
+
* The HID descriptor for G11 sensors leaves logical
2183
+
* maximum set to '1' despite it being a multitouch
2184
+
* device. Override to a sensible number.
2185
+
*/
2186
+
field->logical_maximum = 255;
2187
+
}
2178
2188
break;
2179
2189
}
2180
2190
}