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

diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index 584aab83e4783b12232cc94000431efacbc39d95..66828480d484ca11912d8b163efe0c51445b155c 100644 (file)
--- 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)
        if (err) {
                micbias = M98090_MBVSEL_2V8;
                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);
                micbias = M98090_MBVSEL_2V8;
        }

diff --git a/sound/soc/img/img-parallel-out.c b/sound/soc/img/img-parallel-out.c
index c1610a054d65aafd9bac2032dc05d1f8b68d31eb..33ceb207ee7040ab8f32b5ef5e7546099bd42617 100644 (file)
--- 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,
        struct img_prl_out *prl = snd_soc_dai_get_drvdata(dai);
        unsigned int rate, channels;
        u32 reg, control_set = 0;
-       snd_pcm_format_t format;
 
        rate = params_rate(params);
-       format = params_format(params);
        channels = params_channels(params);
 
        switch (params_format(params)) {