summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/max98090.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-02-20 21:43:40 +0100
committerTakashi Iwai <tiwai@suse.de>2017-02-20 21:43:40 +0100
commit4e25d30c8ddeae6ad0b68440aacadaacb14f8538 (patch)
tree08fe4ac15aec508b370262ad653c83a91be247b5 /sound/soc/codecs/max98090.c
parentd2bb390a2081a36ffe906724d2848d846f2aeb29 (diff)
parent141dee78c40ac2c43aa4ff306688d625e1c731de (diff)
downloadlinux-0-day-4e25d30c8ddeae6ad0b68440aacadaacb14f8538.tar.gz
linux-0-day-4e25d30c8ddeae6ad0b68440aacadaacb14f8538.tar.xz
Merge tag 'asoc-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.11 Another release that's mainly focused on drivers rather than core changes, highlights include: - A huge batch of updates to the Intel drivers, mainly around DisplayPort and HDMI with some additional board support too. - Channel mapping support for HDMI. - Support for AllWinner A31 and A33, Everest Semiconductor ES8328, Nuvoton NAU8540.
Diffstat (limited to 'sound/soc/codecs/max98090.c')
-rw-r--r--sound/soc/codecs/max98090.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index 584aab83e4783..66828480d484c 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)
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;
}