diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 23:34:31 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 23:34:31 +0200 |
| commit | 088eb2a84b3b093af60bbe0b65151e8a9cd2d57d (patch) | |
| tree | 8f145d8c71f6e249d6664b5482ac216b8c6e4016 /drivers/input/touchscreen/tsc2005.c | |
| parent | 6217a69a1e38807b3046b4fd6e4bf413e0e03b67 (diff) | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
Merge tag 'v3.5-rc7' into late/soc
Linux 3.5-rc7
Diffstat (limited to 'drivers/input/touchscreen/tsc2005.c')
| -rw-r--r-- | drivers/input/touchscreen/tsc2005.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c index b6adeaee9cc..5ce3fa8ce64 100644 --- a/drivers/input/touchscreen/tsc2005.c +++ b/drivers/input/touchscreen/tsc2005.c @@ -650,7 +650,8 @@ static int __devinit tsc2005_probe(struct spi_device *spi) tsc2005_stop_scan(ts); error = request_threaded_irq(spi->irq, NULL, tsc2005_irq_thread, - IRQF_TRIGGER_RISING, "tsc2005", ts); + IRQF_TRIGGER_RISING | IRQF_ONESHOT, + "tsc2005", ts); if (error) { dev_err(&spi->dev, "Failed to request irq, err: %d\n", error); goto err_free_mem; |