Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3470da9 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.2' into for-3.3

parents dbb1f516 5c4b2aa3

sound/soc/codecs/ad1836.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

sound/soc/codecs/max9877.c

+5 −5
Original line number Diff line number Diff line
@@ -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);