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

Commit 7b4615ba authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: sn95031: Fix the logic to find free channel 



In the case of no free channel available,
current implementation returns 0 instead of negative errno.

This patch fixes the logic to return -EINVAL if no free channel available.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent efd614ac

sound/soc/codecs/sn95031.c

+3 −5
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static void configure_adc(struct snd_soc_codec *sn95031_codec, int val) 
 */

static int find_free_channel(struct snd_soc_codec *sn95031_codec)

{

	int ret = 0, i, value;

	int i, value;



	/* check whether ADC is enabled */

	value = snd_soc_read(sn95031_codec, SN95031_ADC1CNTL1);
@@ -91,12 +91,10 @@ static int find_free_channel(struct snd_soc_codec *sn95031_codec) 
	for (i = 0; i <	SN95031_ADC_CHANLS_MAX; i++) {

		value = snd_soc_read(sn95031_codec,

				SN95031_ADC_CHNL_START_ADDR + i);

		if (value & SN95031_STOPBIT_MASK) {

			ret = i;

		if (value & SN95031_STOPBIT_MASK)

			break;

	}

	}

	return (ret > SN95031_ADC_LOOP_MAX) ? (-EINVAL) : ret;

	return (i == SN95031_ADC_CHANLS_MAX) ? (-EINVAL) : i;

}



/* Initialize the ADC for reading micbias values. Can sleep. */