diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-08 01:07:48 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-08 01:07:48 +0200 |
| commit | 3c3416abbe3328c2fae054379894614b0c894069 (patch) | |
| tree | 679a21e7b4b56124879248e0455a95a42fa80355 /drivers/input/joystick | |
| parent | Input: imx_keypad - check error returned by clk_prepare_enable() (diff) | |
| parent | Input: request threaded-only IRQs with IRQF_ONESHOT (diff) | |
| download | linux-3c3416abbe3328c2fae054379894614b0c894069.tar.xz 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/joystick')
| -rw-r--r-- | drivers/input/joystick/as5011.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/joystick/as5011.c b/drivers/input/joystick/as5011.c index 57d19d4e0a2d..c96653b58867 100644 --- a/drivers/input/joystick/as5011.c +++ b/drivers/input/joystick/as5011.c @@ -282,7 +282,8 @@ static int __devinit as5011_probe(struct i2c_client *client, error = request_threaded_irq(as5011->button_irq, NULL, as5011_button_interrupt, - IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, + IRQF_TRIGGER_RISING | + IRQF_TRIGGER_FALLING | IRQF_ONESHOT, "as5011_button", as5011); if (error < 0) { dev_err(&client->dev, @@ -296,7 +297,7 @@ static int __devinit as5011_probe(struct i2c_client *client, error = request_threaded_irq(as5011->axis_irq, NULL, as5011_axis_interrupt, - plat_data->axis_irqflags, + plat_data->axis_irqflags | IRQF_ONESHOT, "as5011_joystick", as5011); if (error) { dev_err(&client->dev, |