diff options
author | Michael Hennerich <michael.hennerich@analog.com> | 2011-05-17 02:17:34 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-17 02:20:13 -0400 |
commit | 3532cb0ca2774b05e3c660f536ba3d1b38061fc9 (patch) | |
tree | 61dd9ae4b32a391017c5ffd8ef5c05bb965537b1 /drivers/input/misc | |
parent | e223cc7e96ddbcd32c4a0314d42ae56ade8008e5 (diff) |
Input: ad714x - allow platform code to specify irqflags
Add option to specify irqflags in platfrom data.
Also update copyright notice.
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Tested-by: Jean-Francois Dagenais <jeff.dagenais@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/misc')
-rw-r--r-- | drivers/input/misc/ad714x.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/misc/ad714x.c b/drivers/input/misc/ad714x.c index 0f2db45f730c..5f683ec2999e 100644 --- a/drivers/input/misc/ad714x.c +++ b/drivers/input/misc/ad714x.c | |||
@@ -1257,7 +1257,9 @@ struct ad714x_chip *ad714x_probe(struct device *dev, u16 bus_type, int irq, | |||
1257 | } | 1257 | } |
1258 | 1258 | ||
1259 | error = request_threaded_irq(ad714x->irq, NULL, ad714x_interrupt_thread, | 1259 | error = request_threaded_irq(ad714x->irq, NULL, ad714x_interrupt_thread, |
1260 | IRQF_TRIGGER_FALLING, "ad714x_captouch", ad714x); | 1260 | plat_data->irqflags ? |
1261 | plat_data->irqflags : IRQF_TRIGGER_FALLING, | ||
1262 | "ad714x_captouch", ad714x); | ||
1261 | if (error) { | 1263 | if (error) { |
1262 | dev_err(dev, "can't allocate irq %d\n", ad714x->irq); | 1264 | dev_err(dev, "can't allocate irq %d\n", ad714x->irq); |
1263 | goto err_unreg_dev; | 1265 | goto err_unreg_dev; |