Commit b9fb7299 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'asoc/fix/core' into asoc-linus

parents 7b8ab38e 5e63dfcc
...@@ -4192,10 +4192,10 @@ void snd_soc_remove_platform(struct snd_soc_platform *platform) ...@@ -4192,10 +4192,10 @@ void snd_soc_remove_platform(struct snd_soc_platform *platform)
snd_soc_component_del_unlocked(&platform->component); snd_soc_component_del_unlocked(&platform->component);
mutex_unlock(&client_mutex); mutex_unlock(&client_mutex);
snd_soc_component_cleanup(&platform->component);
dev_dbg(platform->dev, "ASoC: Unregistered platform '%s'\n", dev_dbg(platform->dev, "ASoC: Unregistered platform '%s'\n",
platform->component.name); platform->component.name);
snd_soc_component_cleanup(&platform->component);
} }
EXPORT_SYMBOL_GPL(snd_soc_remove_platform); EXPORT_SYMBOL_GPL(snd_soc_remove_platform);
......
...@@ -352,7 +352,7 @@ static void soc_pcm_apply_msb(struct snd_pcm_substream *substream) ...@@ -352,7 +352,7 @@ static void soc_pcm_apply_msb(struct snd_pcm_substream *substream)
} else { } else {
for (i = 0; i < rtd->num_codecs; i++) { for (i = 0; i < rtd->num_codecs; i++) {
codec_dai = rtd->codec_dais[i]; codec_dai = rtd->codec_dais[i];
if (codec_dai->driver->playback.sig_bits == 0) { if (codec_dai->driver->capture.sig_bits == 0) {
bits = 0; bits = 0;
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment