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/ad7879.c | |
| parent | Input: imx_keypad - check error returned by clk_prepare_enable() (diff) | |
| parent | Input: request threaded-only IRQs with IRQF_ONESHOT (diff) | |
| download | linux-dev-3c3416abbe3328c2fae054379894614b0c894069.tar.xz linux-dev-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/ad7879.c')
| -rw-r--r-- | drivers/input/touchscreen/ad7879.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c index e60709261951..facd3057b62d 100644 --- a/drivers/input/touchscreen/ad7879.c +++ b/drivers/input/touchscreen/ad7879.c @@ -602,7 +602,7 @@ struct ad7879 *ad7879_probe(struct device *dev, u8 devid, unsigned int irq, AD7879_TMR(ts->pen_down_acc_interval); err = request_threaded_irq(ts->irq, NULL, ad7879_irq, - IRQF_TRIGGER_FALLING, + IRQF_TRIGGER_FALLING | IRQF_ONESHOT, dev_name(dev), ts); if (err) { dev_err(dev, "irq %d busy?\n", ts->irq); |