From f55a25c5d98cdc8ba65974a5afc3bd14a8f14c31 Mon Sep 17 00:00:00 2001 From: Jarkko Nikula Date: Wed, 25 Jun 2008 14:58:45 +0300 Subject: [PATCH] --- yaml --- r: 99138 b: refs/heads/master c: 81971a14947b344ee7f6e3781f7ef36d8996f57a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/tlv320aic3x.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 48a4126857d4..c634bb205b31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0bd72a3d49fc9fcac0202e4a2f394c7ee82af914 +refs/heads/master: 81971a14947b344ee7f6e3781f7ef36d8996f57a diff --git a/trunk/sound/soc/codecs/tlv320aic3x.c b/trunk/sound/soc/codecs/tlv320aic3x.c index 0c7452f932e7..29dc0ec3dd23 100644 --- a/trunk/sound/soc/codecs/tlv320aic3x.c +++ b/trunk/sound/soc/codecs/tlv320aic3x.c @@ -809,8 +809,10 @@ static int aic3x_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, { struct snd_soc_codec *codec = codec_dai->codec; struct aic3x_priv *aic3x = codec->private_data; - u8 iface_areg = 0; - u8 iface_breg = 0; + u8 iface_areg, iface_breg; + + iface_areg = aic3x_read_reg_cache(codec, AIC3X_ASD_INTF_CTRLA) & 0x3f; + iface_breg = aic3x_read_reg_cache(codec, AIC3X_ASD_INTF_CTRLB) & 0x3f; /* set master/slave audio interface */ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {