diff options
-rw-r--r-- | drivers/input/misc/ad714x.c | 4 | ||||
-rw-r--r-- | include/linux/input/ad714x.h | 3 |
2 files changed, 5 insertions, 2 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; |
diff --git a/include/linux/input/ad714x.h b/include/linux/input/ad714x.h index 0cbe5e81482e..d388d857bf14 100644 --- a/include/linux/input/ad714x.h +++ b/include/linux/input/ad714x.h | |||
@@ -6,7 +6,7 @@ | |||
6 | * The platform_data for the device's "struct device" holds this | 6 | * The platform_data for the device's "struct device" holds this |
7 | * information. | 7 | * information. |
8 | * | 8 | * |
9 | * Copyright 2009 Analog Devices Inc. | 9 | * Copyright 2009-2011 Analog Devices Inc. |
10 | * | 10 | * |
11 | * Licensed under the GPL-2 or later. | 11 | * Licensed under the GPL-2 or later. |
12 | */ | 12 | */ |
@@ -58,6 +58,7 @@ struct ad714x_platform_data { | |||
58 | struct ad714x_button_plat *button; | 58 | struct ad714x_button_plat *button; |
59 | unsigned short stage_cfg_reg[STAGE_NUM][STAGE_CFGREG_NUM]; | 59 | unsigned short stage_cfg_reg[STAGE_NUM][STAGE_CFGREG_NUM]; |
60 | unsigned short sys_cfg_reg[SYS_CFGREG_NUM]; | 60 | unsigned short sys_cfg_reg[SYS_CFGREG_NUM]; |
61 | unsigned long irqflags; | ||
61 | }; | 62 | }; |
62 | 63 | ||
63 | #endif | 64 | #endif |