aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r--drivers/input/touchscreen/ads7846.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index a9fdf55c023..69210cb56c5 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);