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

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

Merge "ASoC: open ASM session with 24 bit for 24 bit playback"

parents 440facdc 205c6bb4

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

+2 −1
Original line number Diff line number Diff line
@@ -959,7 +959,8 @@ static int msm_compr_configure_dsp(struct snd_compr_stream *cstream) 
		return -EINVAL;

	}



	if (prtd->codec_param.codec.format == SNDRV_PCM_FORMAT_S24_LE)

	if ((prtd->codec_param.codec.format == SNDRV_PCM_FORMAT_S24_LE) ||

		(prtd->codec_param.codec.format == SNDRV_PCM_FORMAT_S24_3LE))

		bits_per_sample = 24;

	else if (prtd->codec_param.codec.format == SNDRV_PCM_FORMAT_S32_LE)

		bits_per_sample = 32;

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

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static int msm_pcm_capture_prepare(struct snd_pcm_substream *substream) 
	struct msm_pcm_routing_evt event;

	int ret = 0;

	int i = 0;

	uint16_t bits_per_sample;

	uint16_t bits_per_sample = 16;

	uint16_t sample_word_size;



	pdata = (struct msm_plat_data *)