linux-toradex.git/drivers/input, branch v2.6.38-rc5

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2011-02-15T17:40:27+00:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: matrix_keypad - increase the limit of rows and columns
  Input: wacom - fix error path in wacom_probe()
  Input: ads7846 - check proper condition when freeing gpio
  Revert "Input: do not pass injected events back to the originating handler"
  Input: sysrq - rework re-inject logic
  Input: serio - clear pending rescans after sysfs driver rebind
  Input: rotary_encoder - use proper irqflags
  Input: wacom_w8001 - report resolution to userland

Input: wacom - fix error path in wacom_probe()

2011-02-11T09:01:15+00:00

If we fail to retrieve HID descriptor we need to free allocated URB so
jump to proper label to do that.

Signed-off-by: Alexander Strakh 
Acked-by: Henrik Rydberg 
Signed-off-by: Dmitry Torokhov

Input: ads7846 - check proper condition when freeing gpio

2011-02-11T08:58:24+00:00

When driver uses custom pendown detection method gpio_pendown is not
set up and so we should not try to free it, otherwise we are presented
with:

------------[ cut here ]------------
WARNING: at drivers/gpio/gpiolib.c:1258 gpio_free+0x100/0x12c()
Modules linked in:
[] (unwind_backtrace+0x0/0xe4) from [](warn_slowpath_common+0x4c/0x64)
[] (warn_slowpath_common+0x4c/0x64) from [](warn_slowpath_null+0x18/0x1c)
[] (warn_slowpath_null+0x18/0x1c) from [](gpio_free+0x100/0x12c)
[] (gpio_free+0x100/0x12c) from [](ads7846_probe+0xa38/0xc5c)
[] (ads7846_probe+0xa38/0xc5c) from [](spi_drv_probe+0x18/0x1c)
[] (spi_drv_probe+0x18/0x1c) from [](driver_probe_device+0xc8/0x184)
[] (driver_probe_device+0xc8/0x184) from [](__driver_attach+0x68/0x8c)
[] (__driver_attach+0x68/0x8c) from [](bus_for_each_dev+0x48/0x74)
[] (bus_for_each_dev+0x48/0x74) from [](bus_add_driver+0xa0/0x220)
[] (bus_add_driver+0xa0/0x220) from [](driver_register+0xa8/0x134)
[] (driver_register+0xa8/0x134) from [](do_one_initcall+0xcc/0x1a4)
[] (do_one_initcall+0xcc/0x1a4) from [](kernel_init+0x14c/0x214)
[] (kernel_init+0x14c/0x214) from [](kernel_thread_exit+0x0/0x8)
---[ end trace 4053287f8a5ec18f ]---

Also rearrange ads7846_setup_pendown() to have only one exit point
returning success.

Reported-by: Sourav Poddar 
Acked-by: Wolfram Sang 
Reviewed-by: Charulatha V 
Signed-off-by: Dmitry Torokhov

arm/ixp4xx: Rename FREQ macro to avoid collisions

2011-02-06T15:49:48+00:00

FREQ is a ridiculously short name for a platform-specific macro in a
generic header, and it now conflicts with an enumeration in the
gspca/ov519 driver.

Also delete conditional reference to ixp4xx_get_board_tick_rate()
which is not defined anywhere.

Signed-off-by: Ben Hutchings 
Signed-off-by: Krzysztof Hałasa

Revert "Input: do not pass injected events back to the originating handler"

2011-02-03T07:04:27+00:00

This reverts commit 5fdbe44d033d059cc56c2803e6b4dbd8cb4e5e39.

Apparently there exist userspace programs that expect to be able to
"loop back" and distribute to readers events written into
/dev/input/eventX and this change made for the benefit of SysRq
handler broke them. Now that SysRq uses alternative method to suppress
filtering of the events it re-injects we can safely revert this change.

Reported-by: Kristen Carlson Accardi 
Cc: stable@kernel.org
Signed-off-by: Dmitry Torokhov

Input: serio - clear pending rescans after sysfs driver rebind

2011-02-03T07:01:52+00:00

When rebinding a serio driver via sysfs drvctl interface it is
possible for an interrupt to trigger after the disconnect of the
existing driver and before the binding of the new driver.  This will
cause the serio interrupt handler to queue a rescan event which will
disconnect the new driver immediately after it is attached.

This change removes pending rescans from the serio event queue after
processing the drvctl request but before releasing the serio mutex.

Reproduction involves issuing a rebind of device port from psmouse
driver to serio_raw driver while generating input to trigger
interrupts.  Then checking to see if the corresponding
i8042/serio4/driver is correctly attached to the serio_raw driver
instead of psmouse.

Signed-off-by: Duncan Laurie 
Signed-off-by: Dmitry Torokhov

Input: rotary_encoder - use proper irqflags

2011-02-03T07:01:00+00:00

IORESOURCE_IRQ_* is wrong for irq_request, use the correct IRQF_* instead.

Signed-off-by: Alexander Stein 
Signed-off-by: Dmitry Torokhov

Input: wacom_w8001 - report resolution to userland

2011-02-01T05:32:24+00:00

Serial devices send both pen and touch data through the same logical
port. Since we scaled touch to pen maximum, we use pen resolution
for touch as well here.

This is under the assumption that pen and touch share the same physical
surface. In the case when a small physical dimensional difference occurs
between pen and touch, we assume the tolerance for touch point precision
is higher than pen and the difference is within touch point tolerance.

A per-MT tool based resolution mechanism should be introduced if the
above assumption does not hold true for the pen and touch devices any
more.

Signed-off-by: Ping Cheng 
Reviewed-by: Henrik Rydberg 
Signed-off-by: Dmitry Torokhov

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2011-01-31T03:02:34+00:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: synaptics - retry failed resets when reconnecting
  Input: synaptics - fix reconnect logic on MT devices
  Input: tegra-kbc - fix keymap entry for LeftMeta key
  Input: tegra-kbc - fix build error

Input: synaptics - retry failed resets when reconnecting

2011-01-29T06:32:07+00:00

On some machines, like Dell Studio XPS 16 (1640), touchpad fails to
respond to the standard query after first reset but may start
responding later, so let's repeat reset sequence several (3) times.

Signed-off-by: Alexandre Peixoto Ferreira 
Signed-off-by: Dmitry Torokhov