diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-12-01 16:32:18 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-12-01 16:32:18 +0100 |
| commit | cf54d47c13c2b171f946289de445102c676d4258 (patch) | |
| tree | c7e88f33402257f3e06bc708e58843518d8ca17b /sound/soc/codecs/max9877.c | |
| parent | 88d686027bb43f585914c77dd363f6e817b42c2a (diff) | |
| parent | bda63586bc5929e97288cdb371bb6456504867ed (diff) | |
| download | blackbird-op-linux-cf54d47c13c2b171f946289de445102c676d4258.tar.gz blackbird-op-linux-cf54d47c13c2b171f946289de445102c676d4258.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/max9877.c')
| -rw-r--r-- | sound/soc/codecs/max9877.c | 10 |
1 files changed, 5 insertions, 5 deletions
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); |
