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

Commit 1a92d131 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: Fix adding channel mixer control failure issue"

parents 8e181ea4 b6a23b83

sound/soc/msm/qdsp6v2/msm-pcm-loopback-v2.c

+72 −44
Original line number Diff line number Diff line
@@ -1077,6 +1077,15 @@ static int msm_pcm_add_channel_mixer_output_map_controls( 
		channel_mixer_output_map_control[0].name = playback_mixer_str;

		channel_mixer_output_map_control[0].private_value =

				(rtd->dai_link->be_id) | (session_type << 8);

		ret = snd_soc_add_platform_controls(rtd->platform,

				&channel_mixer_output_map_control[0],

				1);

		if (ret < 0) {

			pr_err("%s: failed add platform ctl, err = %d\n",

				 __func__, ret);

			ret = -EINVAL;

			goto done;

		}

	}



	if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream != NULL) {
@@ -1094,18 +1103,16 @@ static int msm_pcm_add_channel_mixer_output_map_controls( 
		channel_mixer_output_map_control[1].name = capture_mixer_str;

		channel_mixer_output_map_control[1].private_value =

				(rtd->dai_link->be_id) | (session_type << 8);

	}



		ret = snd_soc_add_platform_controls(rtd->platform,

					channel_mixer_output_map_control,

					ARRAY_SIZE

					(channel_mixer_output_map_control));

				&channel_mixer_output_map_control[1],

				1);

		if (ret < 0) {

			pr_err("%s: failed add platform ctl, err = %d\n",

				 __func__, ret);

			ret = -EINVAL;

			goto done;

		}

	}



done:

	kfree(playback_mixer_str);
@@ -1172,6 +1179,15 @@ static int msm_pcm_add_channel_mixer_input_map_controls( 
		channel_mixer_input_map_control[0].name = playback_mixer_str;

		channel_mixer_input_map_control[0].private_value =

				(rtd->dai_link->be_id) | (session_type << 8);

		ret = snd_soc_add_platform_controls(rtd->platform,

					&channel_mixer_input_map_control[0],

					1);

		if (ret < 0) {

			pr_err("%s: failed add platform ctl, err = %d\n",

				 __func__, ret);

			ret = -EINVAL;

			goto done;

		}

	}



	if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream != NULL) {
@@ -1189,18 +1205,16 @@ static int msm_pcm_add_channel_mixer_input_map_controls( 
		channel_mixer_input_map_control[1].name = capture_mixer_str;

		channel_mixer_input_map_control[1].private_value =

				(rtd->dai_link->be_id) | (session_type << 8);

	}



		ret = snd_soc_add_platform_controls(rtd->platform,

					channel_mixer_input_map_control,

					ARRAY_SIZE

					(channel_mixer_input_map_control));

					&channel_mixer_input_map_control[1],

					1);

		if (ret < 0) {

			pr_err("%s: failed add platform ctl, err = %d\n",

				 __func__, ret);

			ret = -EINVAL;

			goto done;

		}

	}



done:

	kfree(playback_mixer_str);
@@ -1278,6 +1292,15 @@ static int msm_pcm_add_channel_mixer_cfg_controls( 
		channel_mixer_cfg_control[0].name = playback_mixer_str;

		channel_mixer_cfg_control[0].private_value =

				(rtd->dai_link->be_id) | (session_type << 8);

		ret = snd_soc_add_platform_controls(rtd->platform,

						&channel_mixer_cfg_control[0],

						1);

		if (ret < 0) {

			pr_err("%s: failed add platform ctl, err = %d\n",

				 __func__, ret);

			ret = -EINVAL;

			goto done;

		}

	}



	if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream != NULL) {
@@ -1295,18 +1318,16 @@ static int msm_pcm_add_channel_mixer_cfg_controls( 
		channel_mixer_cfg_control[1].name = capture_mixer_str;

		channel_mixer_cfg_control[1].private_value =

				(rtd->dai_link->be_id) | (session_type << 8);

	}



		ret = snd_soc_add_platform_controls(rtd->platform,

					channel_mixer_cfg_control,

					ARRAY_SIZE

					(channel_mixer_cfg_control));

						&channel_mixer_cfg_control[1],

						1);

		if (ret < 0) {

			pr_err("%s: failed add platform ctl, err = %d\n",

				 __func__, ret);

			ret = -EINVAL;

			goto done;

		}

	}



done:

	kfree(playback_mixer_str);
@@ -1378,6 +1399,15 @@ static int msm_pcm_add_channel_mixer_weight_controls( 
		channel_mixer_weight_control[0].private_value =

				(rtd->dai_link->be_id) | (session_type << 8)

				| (channel << 16);

		ret = snd_soc_add_platform_controls(rtd->platform,

					&channel_mixer_weight_control[0],

					1);

		if (ret < 0) {

			pr_err("%s: failed add platform ctl, err = %d\n",

				 __func__, ret);

			ret = -EINVAL;

			goto done;

		}

	}



	if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream != NULL) {
@@ -1398,18 +1428,16 @@ static int msm_pcm_add_channel_mixer_weight_controls( 
		channel_mixer_weight_control[1].private_value =

				(rtd->dai_link->be_id) | (session_type << 8)

				| (channel << 16);

	}



		ret = snd_soc_add_platform_controls(rtd->platform,

					channel_mixer_weight_control,

					ARRAY_SIZE

					(channel_mixer_weight_control));

					&channel_mixer_weight_control[1],

					1);

		if (ret < 0) {

			pr_err("%s: failed add platform ctl, err = %d\n",

				 __func__, ret);

			ret = -EINVAL;

			goto done;

		}

	}



done:

	kfree(playback_mixer_str);

sound/soc/msm/qdsp6v2/msm-pcm-q6-v2.c

+72 −44
Original line number Diff line number Diff line
@@ -2459,6 +2459,15 @@ static int msm_pcm_add_channel_mixer_output_map_controls( 
		channel_mixer_output_map_control[0].name = playback_mixer_str;

		channel_mixer_output_map_control[0].private_value =

				(rtd->dai_link->be_id) | (session_type << 8);

		ret = snd_soc_add_platform_controls(rtd->platform,

				&channel_mixer_output_map_control[0],

				1);

		if (ret < 0) {

			pr_err("%s: failed add platform ctl, err = %d\n",

				 __func__, ret);

			ret = -EINVAL;

			goto done;

		}

	}



	if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream != NULL) {
@@ -2476,18 +2485,16 @@ static int msm_pcm_add_channel_mixer_output_map_controls( 
		channel_mixer_output_map_control[1].name = capture_mixer_str;

		channel_mixer_output_map_control[1].private_value =

				(rtd->dai_link->be_id) | (session_type << 8);

	}



		ret = snd_soc_add_platform_controls(rtd->platform,

					channel_mixer_output_map_control,

					ARRAY_SIZE

					(channel_mixer_output_map_control));

				&channel_mixer_output_map_control[1],

				1);

		if (ret < 0) {

			pr_err("%s: failed add platform ctl, err = %d\n",

				 __func__, ret);

			ret = -EINVAL;

			goto done;

		}

	}



done:

	kfree(playback_mixer_str);
@@ -2554,6 +2561,15 @@ static int msm_pcm_add_channel_mixer_input_map_controls( 
		channel_mixer_input_map_control[0].name = playback_mixer_str;

		channel_mixer_input_map_control[0].private_value =

				(rtd->dai_link->be_id) | (session_type << 8);

		ret = snd_soc_add_platform_controls(rtd->platform,

					&channel_mixer_input_map_control[0],

					1);

		if (ret < 0) {

			pr_err("%s: failed add platform ctl, err = %d\n",

				 __func__, ret);

			ret = -EINVAL;

			goto done;

		}

	}



	if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream != NULL) {
@@ -2571,18 +2587,16 @@ static int msm_pcm_add_channel_mixer_input_map_controls( 
		channel_mixer_input_map_control[1].name = capture_mixer_str;

		channel_mixer_input_map_control[1].private_value =

				(rtd->dai_link->be_id) | (session_type << 8);

	}



		ret = snd_soc_add_platform_controls(rtd->platform,

					channel_mixer_input_map_control,

					ARRAY_SIZE

					(channel_mixer_input_map_control));

					&channel_mixer_input_map_control[1],

					1);

		if (ret < 0) {

			pr_err("%s: failed add platform ctl, err = %d\n",

				 __func__, ret);

			ret = -EINVAL;

			goto done;

		}

	}



done:

	kfree(playback_mixer_str);
@@ -2660,6 +2674,15 @@ static int msm_pcm_add_channel_mixer_cfg_controls( 
		channel_mixer_cfg_control[0].name = playback_mixer_str;

		channel_mixer_cfg_control[0].private_value =

				(rtd->dai_link->be_id) | (session_type << 8);

		ret = snd_soc_add_platform_controls(rtd->platform,

						&channel_mixer_cfg_control[0],

						1);

		if (ret < 0) {

			pr_err("%s: failed add platform ctl, err = %d\n",

				 __func__, ret);

			ret = -EINVAL;

			goto done;

		}

	}



	if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream != NULL) {
@@ -2677,18 +2700,16 @@ static int msm_pcm_add_channel_mixer_cfg_controls( 
		channel_mixer_cfg_control[1].name = capture_mixer_str;

		channel_mixer_cfg_control[1].private_value =

				(rtd->dai_link->be_id) | (session_type << 8);

	}



		ret = snd_soc_add_platform_controls(rtd->platform,

					channel_mixer_cfg_control,

					ARRAY_SIZE

					(channel_mixer_cfg_control));

						&channel_mixer_cfg_control[1],

						1);

		if (ret < 0) {

			pr_err("%s: failed add platform ctl, err = %d\n",

				 __func__, ret);

			ret = -EINVAL;

			goto done;

		}

	}



done:

	kfree(playback_mixer_str);
@@ -2760,6 +2781,15 @@ static int msm_pcm_add_channel_mixer_weight_controls( 
		channel_mixer_weight_control[0].private_value =

				(rtd->dai_link->be_id) | (session_type << 8)

				| (channel << 16);

		ret = snd_soc_add_platform_controls(rtd->platform,

					&channel_mixer_weight_control[0],

					1);

		if (ret < 0) {

			pr_err("%s: failed add platform ctl, err = %d\n",

				 __func__, ret);

			ret = -EINVAL;

			goto done;

		}

	}



	if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream != NULL) {
@@ -2780,18 +2810,16 @@ static int msm_pcm_add_channel_mixer_weight_controls( 
		channel_mixer_weight_control[1].private_value =

				(rtd->dai_link->be_id) | (session_type << 8)

				| (channel << 16);

	}



		ret = snd_soc_add_platform_controls(rtd->platform,

					channel_mixer_weight_control,

					ARRAY_SIZE

					(channel_mixer_weight_control));

					&channel_mixer_weight_control[1],

					1);

		if (ret < 0) {

			pr_err("%s: failed add platform ctl, err = %d\n",

				 __func__, ret);

			ret = -EINVAL;

			goto done;

		}

	}



done:

	kfree(playback_mixer_str);