From e17f86fbfc8717ec99493dcb3b76c04a02418226 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 28 Oct 2011 15:17:56 +0800 Subject: [PATCH] --- yaml --- r: 273569 b: refs/heads/master c: d558cfc30064a97c2c65dbd2b3a4f5a1dea7ec1b h: refs/heads/master i: 273567: 5128df26996711ea69eb269f11e7270a11de3451 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8711.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d6037f89d202..3d9347bfa6c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04c57163c8edfbc50e022737014069998ba4fc5f +refs/heads/master: d558cfc30064a97c2c65dbd2b3a4f5a1dea7ec1b diff --git a/trunk/sound/soc/codecs/wm8711.c b/trunk/sound/soc/codecs/wm8711.c index 8ba49d867ac7..076bdb9930a1 100644 --- a/trunk/sound/soc/codecs/wm8711.c +++ b/trunk/sound/soc/codecs/wm8711.c @@ -232,7 +232,7 @@ static int wm8711_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) { struct snd_soc_codec *codec = codec_dai->codec; - u16 iface = 0; + u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0x000c; /* set master/slave audio interface */ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {