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 updates from Dmitry Torokhov: "Just a few driver fixups,
nothing exciting."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: wacom - fix 3rd-gen Bamboo MT when 4+ fingers are in use
Input: twl4030-vibra - use proper guard for PM methods
Input: evdev - fix variable initialisation
Input: wacom - add missing LEDS_CLASS to Kconfig
Input: ALPS - fix touchpad detection when buttons are pressed
+13
-9
+2
-1
Documentation/input/alps.txt
+2
-1
Documentation/input/alps.txt
···
13
13
14
14
All ALPS touchpads should respond to the "E6 report" command sequence:
15
15
E8-E6-E6-E6-E9. An ALPS touchpad should respond with either 00-00-0A or
16
-
00-00-64.
16
+
00-00-64 if no buttons are pressed. The bits 0-2 of the first byte will be 1s
17
+
if some buttons are pressed.
17
18
18
19
If the E6 report is successful, the touchpad model is identified using the "E7
19
20
report" sequence: E8-E7-E7-E7-E9. The response is the model signature and is
+1
-1
drivers/input/evdev.c
+1
-1
drivers/input/evdev.c
+2
-4
drivers/input/misc/twl4030-vibra.c
+2
-4
drivers/input/misc/twl4030-vibra.c
···
172
172
}
173
173
174
174
/*** Module ***/
175
-
#if CONFIG_PM
175
+
#if CONFIG_PM_SLEEP
176
176
static int twl4030_vibra_suspend(struct device *dev)
177
177
{
178
178
struct platform_device *pdev = to_platform_device(dev);
···
189
189
vibra_disable_leds();
190
190
return 0;
191
191
}
192
+
#endif
192
193
193
194
static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops,
194
195
twl4030_vibra_suspend, twl4030_vibra_resume);
195
-
#endif
196
196
197
197
static int __devinit twl4030_vibra_probe(struct platform_device *pdev)
198
198
{
···
273
273
.driver = {
274
274
.name = "twl4030-vibra",
275
275
.owner = THIS_MODULE,
276
-
#ifdef CONFIG_PM
277
276
.pm = &twl4030_vibra_pm_ops,
278
-
#endif
279
277
},
280
278
};
281
279
module_platform_driver(twl4030_vibra_driver);
+5
-2
drivers/input/mouse/alps.c
+5
-2
drivers/input/mouse/alps.c
···
952
952
953
953
/*
954
954
* First try "E6 report".
955
-
* ALPS should return 0,0,10 or 0,0,100
955
+
* ALPS should return 0,0,10 or 0,0,100 if no buttons are pressed.
956
+
* The bits 0-2 of the first byte will be 1s if some buttons are
957
+
* pressed.
956
958
*/
957
959
param[0] = 0;
958
960
if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES) ||
···
970
968
psmouse_dbg(psmouse, "E6 report: %2.2x %2.2x %2.2x",
971
969
param[0], param[1], param[2]);
972
970
973
-
if (param[0] != 0 || param[1] != 0 || (param[2] != 10 && param[2] != 100))
971
+
if ((param[0] & 0xf8) != 0 || param[1] != 0 ||
972
+
(param[2] != 10 && param[2] != 100))
974
973
return NULL;
975
974
976
975
/*
+2
drivers/input/tablet/Kconfig
+2
drivers/input/tablet/Kconfig
···
77
77
tristate "Wacom Intuos/Graphire tablet support (USB)"
78
78
depends on USB_ARCH_HAS_HCD
79
79
select USB
80
+
select NEW_LEDS
81
+
select LEDS_CLASS
80
82
help
81
83
Say Y here if you want to use the USB version of the Wacom Intuos
82
84
or Graphire tablet. Make sure to say Y to "Mouse support"