sugar/linux
1
0
Fork 0
Code Activity

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

Browse Source
This commit is contained in:
Mark Brown
2017-02-19 16:36:32 +00:00
parent 96f0e8a5b0 bfe48dffc8 1c445a42c4
commit 64c37d50ad
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/max98090.c
View File

@@ -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;
} }

2
sound/soc/img/img-parallel-out.c
View File

@@ -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)) {