diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-08 16:44:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-08 16:44:49 +0100 |
| commit | b9fb729949bcd9e592a4c599d2d7875157181db9 (patch) | |
| tree | ea7755a55656ca3febad3ced03229e3f2e81669d /sound | |
| parent | 7b8ab38e8d9cc804f0d3c263bfaa62d82d8a2da7 (diff) | |
| parent | 5e63dfccf34d4dbf21429c4919f33c028ff49991 (diff) | |
| download | linux-b9fb729949bcd9e592a4c599d2d7875157181db9.tar.gz linux-b9fb729949bcd9e592a4c599d2d7875157181db9.tar.bz2 linux-b9fb729949bcd9e592a4c599d2d7875157181db9.zip | |
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
Diffstat (limited to 'sound')
| -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) snd_soc_component_del_unlocked(&platform->component); mutex_unlock(&client_mutex); - snd_soc_component_cleanup(&platform->component); - dev_dbg(platform->dev, "ASoC: Unregistered platform '%s'\n", platform->component.name); + + snd_soc_component_cleanup(&platform->component); } EXPORT_SYMBOL_GPL(snd_soc_remove_platform); 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) } else { for (i = 0; i < rtd->num_codecs; 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; break; } |