Mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/ https://git.shady.money/linux/atom?h=v3.12 2013-10-31T17:38:59Z 2013-10-31T17:38:59Z Linus Torvalds torvalds@linux-foundation.org 2013-10-31T17:38:59Z urn:sha1:026f8f612a137324869b6dbdf1d526d176e1766e Pull input updates from Dmitry Torokhov: "A bit later than I would want, but the changes are very minor - a few new device IDs for new hardware in existing drivers, fix for battery in Wacom devices not be considered system battery and cause emergency hibernations, and a couple of other bug fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: ALPS - add support for model found on Dell XT2 Input: wacom - add support for ISDv4 0x10E sensor Input: wacom - add support for ISDv4 0x10F sensor Input: wacom - export battery scope Input: cm109 - convert high volume dev_err() to dev_err_ratelimited() Input: move name/timer init to input_alloc_dev() Input: i8042 - i8042_flush fix for a full 8042 buffer Input: pxa27x_keypad - fix NULL pointer dereference 2013-10-31T07:59:20Z Yunkang Tang tommywill2011@gmail.com 2013-10-31T07:55:58Z urn:sha1:5beea882e64121dfe3b33145767d3302afa784d5 This patch adds support for touchpad found on Dell XT2. It's a dual device with device ID: 73, 00, 14, that comply with "ALPS_PROTO_V2". Signed-off-by: Yunkang Tang <yunkang.tang@cn.alps.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2013-10-22T22:37:02Z Jason Gerecke killertofu@gmail.com 2013-10-22T22:35:30Z urn:sha1:2d3163f10256a99d05a64fa03d43747e5634a44b Used in the Fujitsu T732 Signed-off-by: Jason Gerecke <killertofu@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2013-10-22T22:36:57Z Jason Gerecke killertofu@gmail.com 2013-10-16T06:46:34Z urn:sha1:9b4f60e5c9b2285fb08a7656418e8b19bf2a4c9c Signed-off-by: Jason Gerecke <killertofu@gmail.com> Tested-by: Filip Zarnecki <Filip.Zarnecki@fuw.edu.pl> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2013-10-16T06:49:24Z Bastien Nocera hadess@hadess.net 2013-10-16T06:33:00Z urn:sha1:6e2a6e8063e7b5d53ef1687286468791dd143f96 This will stop UPower from detecting the tablet as a power supply, and using its battery status to hibernate or switch off the machine. https://bugs.freedesktop.org/show_bug.cgi?id=70321 Signed-off-by: Bastien Nocera <hadess@hadess.net> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2013-10-06T08:23:41Z Tim Gardner tim.gardner@canonical.com 2013-09-19T21:24:04Z urn:sha1:0a6ad06c43315ce0e5115d5ce51b04464245dde8 BugLink: http://bugs.launchpad.net/bugs/1222850 This input device can get into a state that produces a high volume of device status errors. Attempt to throttle these error messages such that the kernel log is not flooded. Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2013-10-06T08:23:26Z David Herrmann dh.herrmann@gmail.com 2013-10-06T08:15:08Z urn:sha1:a60a71b035e4d2f4920ef091265b1474a14ab313 We want to allow drivers to call input_event() at any time after the device got allocated. This means input_event() and input_register_device() must be allowed to run in parallel. The only conflicting calls in input_register_device() are init_timer() and dev_set_name(). Both can safely be moved to device allocation and we're good to go. Signed-off-by: David Herrmann <dh.herrmann@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2013-09-18T19:22:06Z Andrey Moiseev o2g.org.ru@gmail.com 2013-09-16T22:17:31Z urn:sha1:2f0d2604134880f739642fd7c3ae55db33c838e7 When 8042 internal data buffer is full, the driver erroneously decides that the controller is not present. i8042_flush returns the number of flushed bytes, which is in 0 - I8042_BUFFER_SIZE range inclusive. Therefore, i8042_flush has no way to indicate an error. Moreover i8042_controller_check takes initially full buffer (i8042_flush returned I8042_BUFFER_SIZE) as a sign of absence of the controller. Let's change i8042 to return success/error instead and make sure we do not return error prematurely. Signed-off-by: Andrey Moiseev <o2g.org.ru@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2013-09-18T15:13:54Z Mike Dunn mikedunn@newsguy.com 2013-09-18T15:07:41Z urn:sha1:049d75f72d9b1cce0f5ca66ea324f0b5318046eb A NULL pointer dereference exception occurs in the driver probe function when device tree is used. The pdata pointer will be NULL in this case, but the code dereferences it in all cases. When device tree is used, a platform data structure is allocated and initialized, and in all cases this pointer is copied to the driver's private data, so the variable being tested should be accessed through the driver's private data structure. Signed-off-by: Mike Dunn <mikedunn@newsguy.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2013-09-15T11:13:39Z Linus Torvalds torvalds@linux-foundation.org 2013-09-15T11:13:39Z urn:sha1:8bf5e36d0429e9b8fc2c84966577f10386bd7195 Pull input update from Dmitry Torokhov: "The only change is David Hermann's new EVIOCREVOKE evdev ioctl that allows safely passing file descriptors to input devices to session processes and later being able to stop delivery of events through these fds so that inactive sessions will no longer receive user input that does not belong to them" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: evdev - add EVIOCREVOKE ioctl