diff options
-rw-r--r-- | sound/soc/codecs/max98090.c | 2 | ||||
-rw-r--r-- | sound/soc/img/img-parallel-out.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index 584aab83e478..66828480d484 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c | |||
@@ -2456,7 +2456,7 @@ static int max98090_probe(struct snd_soc_codec *codec) | |||
2456 | if (err) { | 2456 | if (err) { |
2457 | micbias = M98090_MBVSEL_2V8; | 2457 | micbias = M98090_MBVSEL_2V8; |
2458 | dev_info(codec->dev, "use default 2.8v micbias\n"); | 2458 | dev_info(codec->dev, "use default 2.8v micbias\n"); |
2459 | } else if (micbias < M98090_MBVSEL_2V2 || micbias > M98090_MBVSEL_2V8) { | 2459 | } else if (micbias > M98090_MBVSEL_2V8) { |
2460 | dev_err(codec->dev, "micbias out of range 0x%x\n", micbias); | 2460 | dev_err(codec->dev, "micbias out of range 0x%x\n", micbias); |
2461 | micbias = M98090_MBVSEL_2V8; | 2461 | micbias = M98090_MBVSEL_2V8; |
2462 | } | 2462 | } |
diff --git a/sound/soc/img/img-parallel-out.c b/sound/soc/img/img-parallel-out.c index c1610a054d65..33ceb207ee70 100644 --- a/sound/soc/img/img-parallel-out.c +++ b/sound/soc/img/img-parallel-out.c | |||
@@ -123,10 +123,8 @@ static int img_prl_out_hw_params(struct snd_pcm_substream *substream, | |||
123 | struct img_prl_out *prl = snd_soc_dai_get_drvdata(dai); | 123 | struct img_prl_out *prl = snd_soc_dai_get_drvdata(dai); |
124 | unsigned int rate, channels; | 124 | unsigned int rate, channels; |
125 | u32 reg, control_set = 0; | 125 | u32 reg, control_set = 0; |
126 | snd_pcm_format_t format; | ||
127 | 126 | ||
128 | rate = params_rate(params); | 127 | rate = params_rate(params); |
129 | format = params_format(params); | ||
130 | channels = params_channels(params); | 128 | channels = params_channels(params); |
131 | 129 | ||
132 | switch (params_format(params)) { | 130 | switch (params_format(params)) { |