diff --git a/[refs] b/[refs] index b9cee7f03e32..253c1b2eb9e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8c29e7f78a6c52fc5cfa956c4b72c797a468241 +refs/heads/master: 88c494b99a5873a46738c4c3f6f37ccce87b03e9 diff --git a/trunk/sound/soc/codecs/alc5632.c b/trunk/sound/soc/codecs/alc5632.c index 048c60e4cbac..8a3bf7194728 100644 --- a/trunk/sound/soc/codecs/alc5632.c +++ b/trunk/sound/soc/codecs/alc5632.c @@ -811,7 +811,7 @@ static int alc5632_pcm_hw_params(struct snd_pcm_substream *substream, static int alc5632_mute(struct snd_soc_dai *dai, int mute) { struct snd_soc_codec *codec = dai->codec; - u16 hp_mute = ALC5632_MISC_HP_DEPOP_MUTE_L \ + u16 hp_mute = ALC5632_MISC_HP_DEPOP_MUTE_L |ALC5632_MISC_HP_DEPOP_MUTE_R; u16 mute_reg = snd_soc_read(codec, ALC5632_MISC_CTRL) & ~hp_mute;