diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-07 16:07:48 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-07 16:07:48 -0700 |
| commit | 3c3416abbe3328c2fae054379894614b0c894069 (patch) | |
| tree | 679a21e7b4b56124879248e0455a95a42fa80355 /drivers/input/keyboard/qt1070.c | |
| parent | 333fbe8409dfabd3d3581af5cdbd30f666857437 (diff) | |
| parent | 9b7e31bbf4bb58b12e11a7f24b7c3e48bbd2f4da (diff) | |
Merge branch 'for-linus' to bring in change ensuring that drivers that
use threaded IRQs use IRQF_ONESHOT.
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 0b7b2f89175..ca68f2992d7 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; |