diff options
| author | Mark Brown <broonie@kernel.org> | 2019-03-18 12:14:51 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-18 12:14:51 +0100 |
| commit | 22d91ed32b653481f47e81719858678e8c92089e (patch) | |
| tree | a10d240e35ba7fa5d6bb1c9aad1a5db622e5dddd /sound/aoa | |
| parent | ASoC: samsung: odroid: Fix clock configuration for 44100 sample rate (diff) | |
| parent | Linux 5.1-rc1 (diff) | |
| download | linux-22d91ed32b653481f47e81719858678e8c92089e.tar.xz linux-22d91ed32b653481f47e81719858678e8c92089e.zip | |
Merge tag 'v5.1-rc1' into asoc-5.1
Linux 5.1-rc1
Diffstat (limited to 'sound/aoa')
| -rw-r--r-- | sound/aoa/core/gpio-feature.c | 1 | ||||
| -rw-r--r-- | sound/aoa/soundbus/i2sbus/core.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sound/aoa/core/gpio-feature.c b/sound/aoa/core/gpio-feature.c index 65557421fe0b..c3ff721e4660 100644 --- a/sound/aoa/core/gpio-feature.c +++ b/sound/aoa/core/gpio-feature.c @@ -82,6 +82,7 @@ static struct device_node *get_gpio(char *name, if (altname && (strcmp(audio_gpio, altname) == 0)) break; } + of_node_put(gpio); /* still not found, assume not there */ if (!np) return NULL; diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index 40ebde2e1ab1..904659d14988 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c @@ -380,10 +380,6 @@ static int i2sbus_suspend(struct macio_dev* dev, pm_message_t state) int err, ret = 0; list_for_each_entry(i2sdev, &control->list, item) { - /* Notify Alsa */ - /* Suspend PCM streams */ - snd_pcm_suspend_all(i2sdev->sound.pcm); - /* Notify codecs */ list_for_each_entry(cii, &i2sdev->sound.codec_list, list) { err = 0; |