summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-05-28 15:41:36 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-05-28 15:41:36 +0100
commit9f1b2556c57f1fd861313902311275e89f7d9fba (patch)
tree466557cbe84e15d85934b4d206de5026b72e2278 /sound
parent72322e6362fc921411da7410e1c4f5823e1deeda (diff)
parent3d15aacbb802af72b4ff0c3ba576536cdb3bace0 (diff)
downloadlinux-9f1b2556c57f1fd861313902311275e89f7d9fba.tar.gz
linux-9f1b2556c57f1fd861313902311275e89f7d9fba.tar.bz2
linux-9f1b2556c57f1fd861313902311275e89f7d9fba.zip
Merge remote-tracking branch 'asoc/fix/max98090' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/max98090.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index ce0d36412c97..8d14a76c7249 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -2233,7 +2233,7 @@ static int max98090_probe(struct snd_soc_codec *codec)
dev_dbg(codec->dev, "irq = %d\n", max98090->irq);
ret = request_threaded_irq(max98090->irq, NULL,
- max98090_interrupt, IRQF_TRIGGER_FALLING,
+ max98090_interrupt, IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
"max98090_interrupt", codec);
if (ret < 0) {
dev_err(codec->dev, "request_irq failed: %d\n",