diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-28 10:41:36 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-28 10:41:36 -0400 |
| commit | 9f1b2556c57f1fd861313902311275e89f7d9fba (patch) | |
| tree | 466557cbe84e15d85934b4d206de5026b72e2278 /sound | |
| parent | 72322e6362fc921411da7410e1c4f5823e1deeda (diff) | |
| parent | 3d15aacbb802af72b4ff0c3ba576536cdb3bace0 (diff) | |
Merge remote-tracking branch 'asoc/fix/max98090' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/max98090.c | 2 |
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) | |||
| 2233 | dev_dbg(codec->dev, "irq = %d\n", max98090->irq); | 2233 | dev_dbg(codec->dev, "irq = %d\n", max98090->irq); |
| 2234 | 2234 | ||
| 2235 | ret = request_threaded_irq(max98090->irq, NULL, | 2235 | ret = request_threaded_irq(max98090->irq, NULL, |
| 2236 | max98090_interrupt, IRQF_TRIGGER_FALLING, | 2236 | max98090_interrupt, IRQF_TRIGGER_FALLING | IRQF_ONESHOT, |
| 2237 | "max98090_interrupt", codec); | 2237 | "max98090_interrupt", codec); |
| 2238 | if (ret < 0) { | 2238 | if (ret < 0) { |
| 2239 | dev_err(codec->dev, "request_irq failed: %d\n", | 2239 | dev_err(codec->dev, "request_irq failed: %d\n", |