Merge branch 'for-3.2' into for-3.3
This commit is contained in:
commit
e3470da9e6
2 changed files with 6 additions and 6 deletions
|
@ -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)
|
||||
|
|
|
@ -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);
|
||||
|
|
Reference in a new issue