aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/input/touchscreen/ads7846.c5
-rw-r--r--include/linux/spi/ads7846.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index a9fdf55c0238..69210cb56c54 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -1174,7 +1174,10 @@ static int __devinit ads7846_probe(struct spi_device *spi)
1174 goto err_put_regulator; 1174 goto err_put_regulator;
1175 } 1175 }
1176 1176
1177 if (request_irq(spi->irq, ads7846_irq, IRQF_TRIGGER_FALLING, 1177 if (!pdata->irq_flags)
1178 pdata->irq_flags = IRQF_TRIGGER_FALLING;
1179
1180 if (request_irq(spi->irq, ads7846_irq, pdata->irq_flags,
1178 spi->dev.driver->name, ts)) { 1181 spi->dev.driver->name, ts)) {
1179 dev_info(&spi->dev, 1182 dev_info(&spi->dev,
1180 "trying pin change workaround on irq %d\n", spi->irq); 1183 "trying pin change workaround on irq %d\n", spi->irq);
diff --git a/include/linux/spi/ads7846.h b/include/linux/spi/ads7846.h
index b4ae570d3c98..95d36bfb34bc 100644
--- a/include/linux/spi/ads7846.h
+++ b/include/linux/spi/ads7846.h
@@ -54,5 +54,6 @@ struct ads7846_platform_data {
54 void (*filter_cleanup)(void *filter_data); 54 void (*filter_cleanup)(void *filter_data);
55 void (*wait_for_sync)(void); 55 void (*wait_for_sync)(void);
56 bool wakeup; 56 bool wakeup;
57 unsigned long irq_flags;
57}; 58};
58 59