diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-23 10:48:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-23 10:48:03 -0400 |
commit | 1aae31c8306e5f1bdeafd87b2cd9e3f0df3709e5 (patch) | |
tree | 998bff98ca7c79567a03c437ad9094f1f6523647 /drivers/input/misc | |
parent | 6db8148cc59f738c0672f9998add5dc785aededf (diff) | |
parent | ae4bedf0679d99f0a9b80a7ea9b8dd205de05d06 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"The main change is that we now publish "firmware ID" for the serio
devices to help userspace figure out the kind of touchpads it is
dealing with: i8042 will export PS/2 port's PNP IDs as firmware IDs.
You will also get more quirks for Synaptics touchpads in various
Lenovo laptops, a change to elantech driver to recognize even more
models, and fixups to wacom and couple other drivers"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: elantech - add support for newer elantech touchpads
Input: soc_button_array - fix a crash during rmmod
Input: synaptics - add min/max quirk for ThinkPad T431s, L440, L540, S1 Yoga and X1
Input: synaptics - report INPUT_PROP_TOPBUTTONPAD property
Input: Add INPUT_PROP_TOPBUTTONPAD device property
Input: i8042 - add firmware_id support
Input: serio - add firmware_id sysfs attribute
Input: wacom - handle 1024 pressure levels in wacom_tpc_pen
Input: wacom - references to 'wacom->data' should use 'unsigned char*'
Input: wacom - override 'pressure_max' with value from HID_USAGE_PRESSURE
Input: wacom - use full 32-bit HID Usage value in switch statement
Input: wacom - missed the last bit of expresskey for DTU-1031
Input: ads7846 - fix device usage within attribute show
Input: da9055_onkey - remove use of regmap_irq_get_virq()
Diffstat (limited to 'drivers/input/misc')
-rw-r--r-- | drivers/input/misc/da9055_onkey.c | 1 | ||||
-rw-r--r-- | drivers/input/misc/soc_button_array.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/da9055_onkey.c b/drivers/input/misc/da9055_onkey.c index 4b11ede34950..4765799fef74 100644 --- a/drivers/input/misc/da9055_onkey.c +++ b/drivers/input/misc/da9055_onkey.c | |||
@@ -109,7 +109,6 @@ static int da9055_onkey_probe(struct platform_device *pdev) | |||
109 | 109 | ||
110 | INIT_DELAYED_WORK(&onkey->work, da9055_onkey_work); | 110 | INIT_DELAYED_WORK(&onkey->work, da9055_onkey_work); |
111 | 111 | ||
112 | irq = regmap_irq_get_virq(da9055->irq_data, irq); | ||
113 | err = request_threaded_irq(irq, NULL, da9055_onkey_irq, | 112 | err = request_threaded_irq(irq, NULL, da9055_onkey_irq, |
114 | IRQF_TRIGGER_HIGH | IRQF_ONESHOT, | 113 | IRQF_TRIGGER_HIGH | IRQF_ONESHOT, |
115 | "ONKEY", onkey); | 114 | "ONKEY", onkey); |
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c index 08ead2aaede5..20c80f543d5e 100644 --- a/drivers/input/misc/soc_button_array.c +++ b/drivers/input/misc/soc_button_array.c | |||
@@ -169,6 +169,7 @@ static int soc_button_pnp_probe(struct pnp_dev *pdev, | |||
169 | soc_button_remove(pdev); | 169 | soc_button_remove(pdev); |
170 | return error; | 170 | return error; |
171 | } | 171 | } |
172 | continue; | ||
172 | } | 173 | } |
173 | 174 | ||
174 | priv->children[i] = pd; | 175 | priv->children[i] = pd; |