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/qt1070.c | |
parent | Merge tag 'omap-devel-dmtimer-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/timer (diff) | |
parent | clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer (diff) | |
download | linux-dev-35bf8cc74b2b1dfad18df6d330b271e68ab6e3f5.tar.xz linux-dev-35bf8cc74b2b1dfad18df6d330b271e68ab6e3f5.zip |
Merge branch 'picoxcell/timer' into next/timer
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/qt1070.c')
-rw-r--r-- | drivers/input/keyboard/qt1070.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/keyboard/qt1070.c b/drivers/input/keyboard/qt1070.c index 0b7b2f891752..ca68f2992d72 100644 --- a/drivers/input/keyboard/qt1070.c +++ b/drivers/input/keyboard/qt1070.c @@ -201,7 +201,8 @@ static int __devinit qt1070_probe(struct i2c_client *client, msleep(QT1070_RESET_TIME); err = request_threaded_irq(client->irq, NULL, qt1070_interrupt, - IRQF_TRIGGER_NONE, client->dev.driver->name, data); + IRQF_TRIGGER_NONE | IRQF_ONESHOT, + client->dev.driver->name, data); if (err) { dev_err(&client->dev, "fail to request irq\n"); goto err_free_mem; |