diff options
-rw-r--r-- | sound/soc/soc-core.c | 4 | ||||
-rw-r--r-- | sound/soc/soc-pcm.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 3d8cff629a18..4c8f8a23a0e9 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -4192,10 +4192,10 @@ void snd_soc_remove_platform(struct snd_soc_platform *platform) | |||
4192 | snd_soc_component_del_unlocked(&platform->component); | 4192 | snd_soc_component_del_unlocked(&platform->component); |
4193 | mutex_unlock(&client_mutex); | 4193 | mutex_unlock(&client_mutex); |
4194 | 4194 | ||
4195 | snd_soc_component_cleanup(&platform->component); | ||
4196 | |||
4197 | dev_dbg(platform->dev, "ASoC: Unregistered platform '%s'\n", | 4195 | dev_dbg(platform->dev, "ASoC: Unregistered platform '%s'\n", |
4198 | platform->component.name); | 4196 | platform->component.name); |
4197 | |||
4198 | snd_soc_component_cleanup(&platform->component); | ||
4199 | } | 4199 | } |
4200 | EXPORT_SYMBOL_GPL(snd_soc_remove_platform); | 4200 | EXPORT_SYMBOL_GPL(snd_soc_remove_platform); |
4201 | 4201 | ||
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 642c86240752..002311afdeaa 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c | |||
@@ -352,7 +352,7 @@ static void soc_pcm_apply_msb(struct snd_pcm_substream *substream) | |||
352 | } else { | 352 | } else { |
353 | for (i = 0; i < rtd->num_codecs; i++) { | 353 | for (i = 0; i < rtd->num_codecs; i++) { |
354 | codec_dai = rtd->codec_dais[i]; | 354 | codec_dai = rtd->codec_dais[i]; |
355 | if (codec_dai->driver->playback.sig_bits == 0) { | 355 | if (codec_dai->driver->capture.sig_bits == 0) { |
356 | bits = 0; | 356 | bits = 0; |
357 | break; | 357 | break; |
358 | } | 358 | } |