summaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/bu21013_ts.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-07-07 16:07:48 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-07-07 16:07:48 -0700
commit3c3416abbe3328c2fae054379894614b0c894069 (patch)
tree679a21e7b4b56124879248e0455a95a42fa80355 /drivers/input/touchscreen/bu21013_ts.c
parent333fbe8409dfabd3d3581af5cdbd30f666857437 (diff)
parent9b7e31bbf4bb58b12e11a7f24b7c3e48bbd2f4da (diff)
Merge branch 'for-linus' to bring in change ensuring that drivers that
use threaded IRQs use IRQF_ONESHOT.
Diffstat (limited to 'drivers/input/touchscreen/bu21013_ts.c')
-rw-r--r--drivers/input/touchscreen/bu21013_ts.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c
index f2d03c06c2d..5c487d23f11 100644
--- a/drivers/input/touchscreen/bu21013_ts.c
+++ b/drivers/input/touchscreen/bu21013_ts.c
@@ -509,7 +509,8 @@ static int __devinit bu21013_probe(struct i2c_client *client,
input_set_drvdata(in_dev, bu21013_data);
error = request_threaded_irq(pdata->irq, NULL, bu21013_gpio_irq,
- IRQF_TRIGGER_FALLING | IRQF_SHARED,
+ IRQF_TRIGGER_FALLING | IRQF_SHARED |
+ IRQF_ONESHOT,
DRIVER_TP, bu21013_data);
if (error) {
dev_err(&client->dev, "request irq %d failed\n", pdata->irq);