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/dtor/input
Pull input subsystem fixes from Dmitry Torokhov:
"Just a couple touchpad drivers fixups"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: alps - do not reduce trackpoint speed by half
Input: elantech - add new icbody type
Input: elantech - fix detection of touchpads where the revision matches a known rate
+7
-6
+2
-3
drivers/input/mouse/alps.c
+2
-3
drivers/input/mouse/alps.c
···
1063
1063
right = (packet[1] & 0x02) >> 1;
1064
1064
middle = (packet[1] & 0x04) >> 2;
1065
1065
1066
-
/* Divide 2 since trackpoint's speed is too fast */
1067
-
input_report_rel(dev2, REL_X, (char)x / 2);
1068
-
input_report_rel(dev2, REL_Y, -((char)y / 2));
1066
+
input_report_rel(dev2, REL_X, (char)x);
1067
+
input_report_rel(dev2, REL_Y, -((char)y));
1069
1068
1070
1069
input_report_key(dev2, BTN_LEFT, left);
1071
1070
input_report_key(dev2, BTN_RIGHT, right);
+5
-3
drivers/input/mouse/elantech.c
+5
-3
drivers/input/mouse/elantech.c
···
1376
1376
return true;
1377
1377
1378
1378
/*
1379
-
* Some models have a revision higher then 20. Meaning param[2] may
1380
-
* be 10 or 20, skip the rates check for these.
1379
+
* Some hw_version >= 4 models have a revision higher then 20. Meaning
1380
+
* that param[2] may be 10 or 20, skip the rates check for these.
1381
1381
*/
1382
-
if (param[0] == 0x46 && (param[1] & 0xef) == 0x0f && param[2] < 40)
1382
+
if ((param[0] & 0x0f) >= 0x06 && (param[1] & 0xaf) == 0x0f &&
1383
+
param[2] < 40)
1383
1384
return true;
1384
1385
1385
1386
for (i = 0; i < ARRAY_SIZE(rates); i++)
···
1556
1555
case 9:
1557
1556
case 10:
1558
1557
case 13:
1558
+
case 14:
1559
1559
etd->hw_version = 4;
1560
1560
break;
1561
1561
default: