Merge remote-tracking branches 'asoc/topic/max9878', 'asoc/topic/max98927', 'asoc...

[linux-block.git] / sound / soc / codecs / max9867.c

diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c
index 3a3d5bebc24edf9d20c78218f5a4c7d7d481acb3..0247edc9c84ebebfc0e9150e3b1b7c408659b1a6 100644 (file)
--- a/sound/soc/codecs/max9867.c
+++ b/sound/soc/codecs/max9867.c
@@ -309,7 +309,6 @@ static int max9867_dai_set_fmt(struct snd_soc_dai *codec_dai,
        struct snd_soc_codec *codec = codec_dai->codec;
        struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec);
        u8 iface1A = 0, iface1B = 0;
-       int ret;
 
        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
        case SND_SOC_DAIFMT_CBM_CFM:
@@ -346,8 +345,8 @@ static int max9867_dai_set_fmt(struct snd_soc_dai *codec_dai,
                return -EINVAL;
        }
 
-       ret = regmap_write(max9867->regmap, MAX9867_IFC1A, iface1A);
-       ret = regmap_write(max9867->regmap, MAX9867_IFC1B, iface1B);
+       regmap_write(max9867->regmap, MAX9867_IFC1A, iface1A);
+       regmap_write(max9867->regmap, MAX9867_IFC1B, iface1B);
        return 0;
 }