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

Commit 9e1d3e97 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 DTS TRUMEDIA cal type initialization"

parents 69b6fa93 99e27cef

include/uapi/linux/msm_audio_calibration.h

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ enum { 


	DTS_EAGLE_CAL_TYPE,

	AUDIO_CORE_METAINFO_CAL_TYPE,

	SRS_TRUMEDIA_CAL_TYPE,



	MAX_CAL_TYPES,

};

sound/soc/msm/qdsp6v2/audio_cal_utils.c

+6 −0
Original line number Diff line number Diff line
@@ -125,6 +125,9 @@ size_t get_cal_info_size(int32_t cal_type) 
	case AUDIO_CORE_METAINFO_CAL_TYPE:

		size = sizeof(struct audio_cal_info_metainfo);

		break;

	case SRS_TRUMEDIA_CAL_TYPE:

		size = 0;

		break;

	default:

		pr_err("%s:Invalid cal type %d!",

			__func__, cal_type);
@@ -234,6 +237,9 @@ size_t get_user_cal_type_size(int32_t cal_type) 
	case AUDIO_CORE_METAINFO_CAL_TYPE:

		size = sizeof(struct audio_cal_type_metainfo);

		break;

	case SRS_TRUMEDIA_CAL_TYPE:

		size = 0;

		break;

	default:

		pr_err("%s:Invalid cal type %d!",

			__func__, cal_type);

sound/soc/msm/qdsp6v2/q6adm.c

+4 −0
Original line number Diff line number Diff line
@@ -2557,6 +2557,10 @@ static int adm_init_cal_data(void) 


		{{DTS_EAGLE_CAL_TYPE,

		{NULL, NULL, NULL, NULL, NULL, NULL} },

		{NULL, NULL, cal_utils_match_buf_num} },



		{{SRS_TRUMEDIA_CAL_TYPE,

		{NULL, NULL, NULL, NULL, NULL, NULL} },

		{NULL, NULL, cal_utils_match_buf_num} }

	};

	pr_debug("%s:\n", __func__);