Преглед изворни кода

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

Mark Brown пре 11 година
родитељ
комит
b9fb729949
2 измењених фајлова са 3 додато и 3 уклоњено
  1. 2 2
      sound/soc/soc-core.c
  2. 1 1
      sound/soc/soc-pcm.c

+ 2 - 2
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);
 

+ 1 - 1
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;
 			}