diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-28 08:25:43 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-28 08:25:43 +0100 |
| commit | dcc3c4c016481de3fdb99c1f6ecb04d4229513d4 (patch) | |
| tree | d3d40306e6dfe0971c6f7fca6a0e37bbe66d2215 /sound/soc/codecs/wm8995.c | |
| parent | ded9f5238bb719737f82b0b5b957937cb0203804 (diff) | |
| parent | a3adfa00e8089aa72826c6ba04bcb18cfceaf0a9 (diff) | |
| download | kernel_samsung_crespo-dcc3c4c016481de3fdb99c1f6ecb04d4229513d4.zip kernel_samsung_crespo-dcc3c4c016481de3fdb99c1f6ecb04d4229513d4.tar.gz kernel_samsung_crespo-dcc3c4c016481de3fdb99c1f6ecb04d4229513d4.tar.bz2 | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/wm8995.c')
| -rw-r--r-- | sound/soc/codecs/wm8995.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c index 6045cbd..608c84c 100644 --- a/sound/soc/codecs/wm8995.c +++ b/sound/soc/codecs/wm8995.c @@ -1223,7 +1223,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 |