]> git.hungrycats.org Git - linux/commitdiff
ASoC: mc13783: Fix wrong mask value used in mc13xxx_reg_rmw() calls
authorAxel Lin <axel.lin@ingics.com>
Mon, 27 Apr 2015 06:51:35 +0000 (14:51 +0800)
committerSasha Levin <sasha.levin@oracle.com>
Wed, 10 Jun 2015 17:42:10 +0000 (13:42 -0400)
[ Upstream commit 545774bd6e1427d98dde77244329d2311c5eca6f ]

mc13xxx_reg_rmw() won't change any bit if passing 0 to the mask field.
Pass AUDIO_SSI_SEL instead of 0 for the mask field to set AUDIO_SSI_SEL
bit.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
sound/soc/codecs/mc13783.c

index 71f775aad7c715f18b3ebdd16b385bb5501de5eb..2f98417b16b7c46a325dcc40a2be5d2436c48b8e 100644 (file)
@@ -623,14 +623,14 @@ static int mc13783_probe(struct snd_soc_codec *codec)
                                AUDIO_SSI_SEL, 0);
        else
                mc13xxx_reg_rmw(priv->mc13xxx, MC13783_AUDIO_CODEC,
-                               0, AUDIO_SSI_SEL);
+                               AUDIO_SSI_SEL, AUDIO_SSI_SEL);
 
        if (priv->dac_ssi_port == MC13783_SSI1_PORT)
                mc13xxx_reg_rmw(priv->mc13xxx, MC13783_AUDIO_DAC,
                                AUDIO_SSI_SEL, 0);
        else
                mc13xxx_reg_rmw(priv->mc13xxx, MC13783_AUDIO_DAC,
-                               0, AUDIO_SSI_SEL);
+                               AUDIO_SSI_SEL, AUDIO_SSI_SEL);
 
        return 0;
 }