diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-22 13:09:03 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-22 13:09:03 +0000 |
| commit | e3470da9e6f1f958737df7fe95631d20024f61b2 (patch) | |
| tree | fa87a056faf3204b9efadf620e9121dfdb845b96 /sound | |
| parent | dbb1f516375b3019373f2177b46e334b47a6d8bf (diff) | |
| parent | 5c4b2aa3fd1dc30af098de5dec766a817621ace2 (diff) | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/ad1836.h | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/max9877.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/codecs/ad1836.h b/sound/soc/codecs/ad1836.h index 444747f0db26..dd7be0dbbc58 100644 --- a/sound/soc/codecs/ad1836.h +++ b/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/sound/soc/codecs/max9877.c b/sound/soc/codecs/max9877.c index 9e7e964a5fa3..dcf6f2a1600a 100644 --- a/sound/soc/codecs/max9877.c +++ b/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); |