Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9fb7299 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 7b8ab38e 5e63dfcc

sound/soc/soc-core.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

sound/soc/soc-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

			}