From: Mark Brown <broonie@kernel.org>
Date: Sun, 30 Aug 2015 14:52:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cb42e0f709a73caf4d631be32189bb1ca513ad25;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-next
---

cb42e0f709a73caf4d631be32189bb1ca513ad25
diff --cc sound/soc/soc-dapm.c
index c0117dd5c770,a6c0ed15fc14..89e63166b50c
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@@ -2224,15 -2283,12 +2226,16 @@@ static ssize_t dapm_widget_show(struct 
  	struct snd_soc_pcm_runtime *rtd = dev_get_drvdata(dev);
  	int i, count = 0;
  
 +	mutex_lock(&rtd->card->dapm_mutex);
 +
  	for (i = 0; i < rtd->num_codecs; i++) {
- 		struct snd_soc_codec *codec = rtd->codec_dais[i]->codec;
- 		count += dapm_widget_show_codec(codec, buf + count);
+ 		struct snd_soc_component *cmpnt = rtd->codec_dais[i]->component;
+ 
+ 		count += dapm_widget_show_component(cmpnt, buf + count);
  	}
  
 +	mutex_unlock(&rtd->card->dapm_mutex);
 +
  	return count;
  }