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/touchscreen/atmel_mxt_ts.c | |
| parent | 333fbe8409dfabd3d3581af5cdbd30f666857437 (diff) | |
| parent | 9b7e31bbf4bb58b12e11a7f24b7c3e48bbd2f4da (diff) | |
| download | talos-op-linux-3c3416abbe3328c2fae054379894614b0c894069.tar.gz talos-op-linux-3c3416abbe3328c2fae054379894614b0c894069.zip | |
Merge branch 'for-linus' to bring in change ensuring that drivers that
use threaded IRQs use IRQF_ONESHOT.
Diffstat (limited to 'drivers/input/touchscreen/atmel_mxt_ts.c')
| -rw-r--r-- | drivers/input/touchscreen/atmel_mxt_ts.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 42e645062c20..25fd0561a17d 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -1149,7 +1149,8 @@ static int __devinit mxt_probe(struct i2c_client *client, goto err_free_object; error = request_threaded_irq(client->irq, NULL, mxt_interrupt, - pdata->irqflags, client->dev.driver->name, data); + pdata->irqflags | IRQF_ONESHOT, + client->dev.driver->name, data); if (error) { dev_err(&client->dev, "Failed to register interrupt\n"); goto err_free_object; |
