Merge "ASoC: msmcobalt: Check for number of aux codecs" (3993230d) · Commits · e / devices / android_kernel_sony_msm8998

sound/soc/msm/msmcobalt.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -3180,8 +3180,10 @@ static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd)
		* Send speaker configuration only for WSA8810.
		* Defalut configuration is for WSA8815.
		*/
		pr_debug("%s: Number of aux devices: %d\n",
		__func__, rtd->card->num_aux_devs);
		if (!strcmp(dev_name(codec_dai->dev), "tavil_codec")) {
		if (rtd_aux && rtd_aux->component)
		if (rtd->card->num_aux_devs && rtd_aux && rtd_aux->component)
		if (!strcmp(rtd_aux->component->name, WSA8810_NAME_1) \|\|
		!strcmp(rtd_aux->component->name, WSA8810_NAME_2)) {
		tavil_set_spkr_mode(rtd->codec, SPKR_MODE_1);
		@@ -3200,7 +3202,7 @@ static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd)
		pdata->codec_root = entry;
		tavil_codec_info_create_codec_entry(pdata->codec_root, codec);
		} else {
		if (rtd_aux && rtd_aux->component)
		if (rtd->card->num_aux_devs && rtd_aux && rtd_aux->component)
		if (!strcmp(rtd_aux->component->name, WSA8810_NAME_1) \|\|
		!strcmp(rtd_aux->component->name, WSA8810_NAME_2)) {
		tasha_set_spkr_mode(rtd->codec, SPKR_MODE_1);