diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-07-15 10:24:53 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-07-15 10:24:53 +0200 |
| commit | e8b9dd7e2471b1274e3be719fcc385e0a710e46f (patch) | |
| tree | 030d7ce20e8f8767d9423f78c102aba089eec372 /drivers/input/touchscreen/cy8ctmg110_ts.c | |
| parent | Merge branch 'nohz-for-tip-2' of git://github.com/fweisbec/linux-dynticks int... (diff) | |
| parent | ntp: Fix STA_INS/DEL clearing bug (diff) | |
| download | linux-e8b9dd7e2471b1274e3be719fcc385e0a710e46f.tar.xz linux-e8b9dd7e2471b1274e3be719fcc385e0a710e46f.zip | |
Merge branch 'timers/urgent' into timers/core
Reason: Update to upstream changes to avoid further conflicts.
Fixup a trivial merge conflict in kernel/time/tick-sched.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/input/touchscreen/cy8ctmg110_ts.c')
| -rw-r--r-- | drivers/input/touchscreen/cy8ctmg110_ts.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/cy8ctmg110_ts.c b/drivers/input/touchscreen/cy8ctmg110_ts.c index 237753ad1031..464f1bf4b61d 100644 --- a/drivers/input/touchscreen/cy8ctmg110_ts.c +++ b/drivers/input/touchscreen/cy8ctmg110_ts.c @@ -251,7 +251,8 @@ static int __devinit cy8ctmg110_probe(struct i2c_client *client, } err = request_threaded_irq(client->irq, NULL, cy8ctmg110_irq_thread, - IRQF_TRIGGER_RISING, "touch_reset_key", ts); + IRQF_TRIGGER_RISING | IRQF_ONESHOT, + "touch_reset_key", ts); if (err < 0) { dev_err(&client->dev, "irq %d busy? error %d\n", client->irq, err); |