diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 17:27:36 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 17:27:36 +0200 |
commit | 35bf8cc74b2b1dfad18df6d330b271e68ab6e3f5 (patch) | |
tree | adf37371beb73adbb0d2414a52d86580dd37d2e0 /drivers/input/keyboard/mpr121_touchkey.c | |
parent | 5351da96bd6662d28c41a3e9e652019a11f3cf7c (diff) | |
parent | cfda590178a16e2b5edb09e131460b3e64819807 (diff) |
Merge branch 'picoxcell/timer' into next/timertimer
Imported from mailing list
* picoxcell/timer:
clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/input/keyboard/mpr121_touchkey.c')
-rw-r--r-- | drivers/input/keyboard/mpr121_touchkey.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/mpr121_touchkey.c b/drivers/input/keyboard/mpr121_touchkey.c index caa218a51b5a..7613f1cac951 100644 --- a/drivers/input/keyboard/mpr121_touchkey.c +++ b/drivers/input/keyboard/mpr121_touchkey.c @@ -248,7 +248,7 @@ static int __devinit mpr_touchkey_probe(struct i2c_client *client, error = request_threaded_irq(client->irq, NULL, mpr_touchkey_interrupt, - IRQF_TRIGGER_FALLING, + IRQF_TRIGGER_FALLING | IRQF_ONESHOT, client->dev.driver->name, mpr121); if (error) { dev_err(&client->dev, "Failed to register interrupt\n"); |