Commit e66ef2f8 authored by Mark Brown's avatar Mark Brown

Merge branch 'for-2.6.38' into for-2.6.39

parents 474b62d6 78b3fb46
......@@ -2386,7 +2386,7 @@ static int wm8994_set_tristate(struct snd_soc_dai *codec_dai, int tristate)
else
val = 0;
return snd_soc_update_bits(codec, reg, mask, reg);
return snd_soc_update_bits(codec, reg, mask, val);
}
#define WM8994_RATES SNDRV_PCM_RATE_8000_96000
......
......@@ -1265,7 +1265,7 @@ static int wm8995_set_tristate(struct snd_soc_dai *codec_dai, int tristate)
else
val = 0;
return snd_soc_update_bits(codec, reg, mask, reg);
return snd_soc_update_bits(codec, reg, mask, val);
}
/* The size in bits of the FLL divide multiplied by 10
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment