diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:37 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:37 -0700 |
| commit | e55574f93ecb78dac5a15f29d18f2ab4dbc813bc (patch) | |
| tree | ffce30ba6d6a11b3fdc5ebd28e5f3cca2d87d12c /sound/soc/codecs | |
| parent | 9ea00e4fa07ce46ab79c92087c72ae100de4de42 (diff) | |
| parent | d831fd1b46d04e5c8c8a0431c321578d25852695 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rtlsk-v3.10-rt-14.09
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/max98090.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/wm_adsp.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index 9b7746c9546f..76bfeb3c3e30 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -2234,7 +2234,7 @@ static int max98090_probe(struct snd_soc_codec *codec) /* Register for interrupts */ dev_dbg(codec->dev, "irq = %d\n", max98090->irq); - ret = request_threaded_irq(max98090->irq, NULL, + ret = devm_request_threaded_irq(codec->dev, max98090->irq, NULL, max98090_interrupt, IRQF_TRIGGER_FALLING | IRQF_ONESHOT, "max98090_interrupt", codec); if (ret < 0) { diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 6dbb17d050c9..ca1e999026e5 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1284,3 +1284,5 @@ int wm_adsp2_init(struct wm_adsp *adsp, bool dvfs) return 0; } EXPORT_SYMBOL_GPL(wm_adsp2_init); + +MODULE_LICENSE("GPL v2"); |