diff options
Diffstat (limited to 'drivers/input/touchscreen/ads7846.c')
| -rw-r--r-- | drivers/input/touchscreen/ads7846.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index dd8c6a9ffc76..b45a45ca7cc9 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c | |||
| @@ -29,9 +29,6 @@ | |||
| 29 | #ifdef CONFIG_ARCH_OMAP | 29 | #ifdef CONFIG_ARCH_OMAP |
| 30 | #include <asm/arch/gpio.h> | 30 | #include <asm/arch/gpio.h> |
| 31 | #endif | 31 | #endif |
| 32 | |||
| 33 | #else | ||
| 34 | #define set_irq_type(irq,type) do{}while(0) | ||
| 35 | #endif | 32 | #endif |
| 36 | 33 | ||
| 37 | 34 | ||
| @@ -509,14 +506,14 @@ static int __devinit ads7846_probe(struct spi_device *spi) | |||
| 509 | ts->msg.complete = ads7846_rx; | 506 | ts->msg.complete = ads7846_rx; |
| 510 | ts->msg.context = ts; | 507 | ts->msg.context = ts; |
| 511 | 508 | ||
| 512 | if (request_irq(spi->irq, ads7846_irq, SA_SAMPLE_RANDOM, | 509 | if (request_irq(spi->irq, ads7846_irq, |
| 513 | spi->dev.bus_id, ts)) { | 510 | SA_SAMPLE_RANDOM | SA_TRIGGER_FALLING, |
| 511 | spi->dev.bus_id, ts)) { | ||
| 514 | dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq); | 512 | dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq); |
| 515 | input_unregister_device(&ts->input); | 513 | input_unregister_device(&ts->input); |
| 516 | kfree(ts); | 514 | kfree(ts); |
| 517 | return -EBUSY; | 515 | return -EBUSY; |
| 518 | } | 516 | } |
| 519 | set_irq_type(spi->irq, IRQT_FALLING); | ||
| 520 | 517 | ||
| 521 | dev_info(&spi->dev, "touchscreen, irq %d\n", spi->irq); | 518 | dev_info(&spi->dev, "touchscreen, irq %d\n", spi->irq); |
| 522 | 519 | ||
