From 4972314cfb72484f0953bbd3339473f66068b9fd Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 22 Nov 2011 13:09:03 +0000 Subject: [PATCH] --- yaml --- r: 283746 b: refs/heads/master c: e3470da9e6f1f958737df7fe95631d20024f61b2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/ad1836.h | 2 +- trunk/sound/soc/codecs/max9877.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2523d8b701a3..9c1b0a630eb0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbb1f516375b3019373f2177b46e334b47a6d8bf +refs/heads/master: e3470da9e6f1f958737df7fe95631d20024f61b2 diff --git a/trunk/sound/soc/codecs/ad1836.h b/trunk/sound/soc/codecs/ad1836.h index 444747f0db26..dd7be0dbbc58 100644 --- a/trunk/sound/soc/codecs/ad1836.h +++ b/trunk/sound/soc/codecs/ad1836.h @@ -34,7 +34,7 @@ #define AD1836_ADC_CTRL2 13 #define AD1836_ADC_WORD_LEN_MASK 0x30 -#define AD1836_ADC_WORD_OFFSET 5 +#define AD1836_ADC_WORD_OFFSET 4 #define AD1836_ADC_SERFMT_MASK (7 << 6) #define AD1836_ADC_SERFMT_PCK256 (0x4 << 6) #define AD1836_ADC_SERFMT_PCK128 (0x5 << 6) diff --git a/trunk/sound/soc/codecs/max9877.c b/trunk/sound/soc/codecs/max9877.c index 9e7e964a5fa3..dcf6f2a1600a 100644 --- a/trunk/sound/soc/codecs/max9877.c +++ b/trunk/sound/soc/codecs/max9877.c @@ -106,13 +106,13 @@ static int max9877_set_2reg(struct snd_kcontrol *kcontrol, unsigned int mask = mc->max; unsigned int val = (ucontrol->value.integer.value[0] & mask); unsigned int val2 = (ucontrol->value.integer.value[1] & mask); - unsigned int change = 1; + unsigned int change = 0; - if (((max9877_regs[reg] >> shift) & mask) == val) - change = 0; + if (((max9877_regs[reg] >> shift) & mask) != val) + change = 1; - if (((max9877_regs[reg2] >> shift) & mask) == val2) - change = 0; + if (((max9877_regs[reg2] >> shift) & mask) != val2) + change = 1; if (change) { max9877_regs[reg] &= ~(mask << shift);