diff options
author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-09-09 17:04:13 -0500 |
---|---|---|
committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-09-09 17:04:13 -0500 |
commit | 48ffd0d5e7b2fb6e7d47344320dbeeaf15d6fd5a (patch) | |
tree | 835283be489a3ea03d0f10ca8dbb00ad55a3cd20 /drivers/iio/adc/twl4030-madc.c | |
parent | aa3ff8e7ce15d756e49141d9aa3f1d9151cda1ca (diff) | |
parent | d9e292d3ea94ab21f028108527a908e415e856ef (diff) |
Merge tag 'lsk-v4.1-15.08-rt' of http://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lng-v4.1-rtlinux-lng-preempt-rt-4.1.5-2015.09
LSK RT 15.08 v4.1
Diffstat (limited to 'drivers/iio/adc/twl4030-madc.c')
-rw-r--r-- | drivers/iio/adc/twl4030-madc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c index 94c5f05b4bc1..4caecbea4c97 100644 --- a/drivers/iio/adc/twl4030-madc.c +++ b/drivers/iio/adc/twl4030-madc.c @@ -835,7 +835,8 @@ static int twl4030_madc_probe(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); ret = devm_request_threaded_irq(&pdev->dev, irq, NULL, twl4030_madc_threaded_irq_handler, - IRQF_TRIGGER_RISING, "twl4030_madc", madc); + IRQF_TRIGGER_RISING | IRQF_ONESHOT, + "twl4030_madc", madc); if (ret) { dev_err(&pdev->dev, "could not request irq\n"); goto err_i2c; |