From b3b47f20f47c43034bdfacfb5d1a61759e77572b Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 14 Oct 2011 17:01:59 +0800 Subject: [PATCH] --- yaml --- r: 270877 b: refs/heads/master c: f3aa7219b15c140fece2ec6b9240fccc3b7a5afd h: refs/heads/master i: 270875: 1988d4c46fa425a1819ef4afe949c74cb1dae311 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/ad193x.c | 2 +- trunk/sound/soc/codecs/ad193x.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 542451ca1319..32de825ee060 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79d07265137c166cf298d74a29038a76458ec46a +refs/heads/master: f3aa7219b15c140fece2ec6b9240fccc3b7a5afd diff --git a/trunk/sound/soc/codecs/ad193x.c b/trunk/sound/soc/codecs/ad193x.c index f934670199a5..39056ce66302 100644 --- a/trunk/sound/soc/codecs/ad193x.c +++ b/trunk/sound/soc/codecs/ad193x.c @@ -298,7 +298,7 @@ static int ad193x_hw_params(struct snd_pcm_substream *substream, } reg = snd_soc_read(codec, AD193X_PLL_CLK_CTRL0); - reg = (reg & AD193X_PLL_INPUT_MASK) | master_rate; + reg = (reg & (~AD193X_PLL_INPUT_MASK)) | master_rate; snd_soc_write(codec, AD193X_PLL_CLK_CTRL0, reg); reg = snd_soc_read(codec, AD193X_DAC_CTRL2); diff --git a/trunk/sound/soc/codecs/ad193x.h b/trunk/sound/soc/codecs/ad193x.h index 536e5f2b136e..1507eaa425a3 100644 --- a/trunk/sound/soc/codecs/ad193x.h +++ b/trunk/sound/soc/codecs/ad193x.h @@ -11,7 +11,7 @@ #define AD193X_PLL_CLK_CTRL0 0x00 #define AD193X_PLL_POWERDOWN 0x01 -#define AD193X_PLL_INPUT_MASK (~0x6) +#define AD193X_PLL_INPUT_MASK 0x6 #define AD193X_PLL_INPUT_256 (0 << 1) #define AD193X_PLL_INPUT_384 (1 << 1) #define AD193X_PLL_INPUT_512 (2 << 1)