system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-20 19:17:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-2.6.38' into for-2.6.39

Browse source
This commit is contained in:
Mark Brown 2011-01-19 14:50:22 +00:00
parent 474b62d6ee 78b3fb4675
commit e66ef2f81f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sound/soc/codecs/wm8994.c
View file

@ -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

2
sound/soc/codecs/wm8995.c
View file

@ -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