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

Commit 64c37d50 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/img' and 'asoc/topic/max98090' into asoc-next

parents 96f0e8a5 bfe48dff 1c445a42

sound/soc/codecs/max98090.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2456,7 +2456,7 @@ static int max98090_probe(struct snd_soc_codec *codec) 
	if (err) {

	if (err) {

		micbias = M98090_MBVSEL_2V8;

		micbias = M98090_MBVSEL_2V8;

		dev_info(codec->dev, "use default 2.8v micbias\n");

		dev_info(codec->dev, "use default 2.8v micbias\n");

	} else if (micbias < M98090_MBVSEL_2V2 || micbias > M98090_MBVSEL_2V8) {

	} else if (micbias > M98090_MBVSEL_2V8) {

		dev_err(codec->dev, "micbias out of range 0x%x\n", micbias);

		dev_err(codec->dev, "micbias out of range 0x%x\n", micbias);

		micbias = M98090_MBVSEL_2V8;

		micbias = M98090_MBVSEL_2V8;

	}

	}

sound/soc/img/img-parallel-out.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -123,10 +123,8 @@ static int img_prl_out_hw_params(struct snd_pcm_substream *substream, 
	struct img_prl_out *prl = snd_soc_dai_get_drvdata(dai);

	struct img_prl_out *prl = snd_soc_dai_get_drvdata(dai);

	unsigned int rate, channels;

	unsigned int rate, channels;

	u32 reg, control_set = 0;

	u32 reg, control_set = 0;

	snd_pcm_format_t format;





	rate = params_rate(params);

	rate = params_rate(params);

	format = params_format(params);

	channels = params_channels(params);

	channels = params_channels(params);





	switch (params_format(params)) {

	switch (params_format(params)) {