From 4192c7a1ba5e5ca5fb77f1d57e849dd7cb1dc7d2 Mon Sep 17 00:00:00 2001 From: James C Georgas Date: Thu, 7 Dec 2006 08:10:57 +0100 Subject: [PATCH] --- yaml --- r: 44734 b: refs/heads/master c: e8bb036a46ec4a9d748672f54a6b2d62c82b6fbd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/ac97/ac97_codec.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6af8842c8bab..05a29287e403 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5f6a38d9896614e2e78a82c6cb818721601c52f +refs/heads/master: e8bb036a46ec4a9d748672f54a6b2d62c82b6fbd diff --git a/trunk/sound/pci/ac97/ac97_codec.c b/trunk/sound/pci/ac97/ac97_codec.c index 7abcb10b2754..91d8ceb4e9c2 100644 --- a/trunk/sound/pci/ac97/ac97_codec.c +++ b/trunk/sound/pci/ac97/ac97_codec.c @@ -382,7 +382,7 @@ int snd_ac97_update_bits_nolock(struct snd_ac97 *ac97, unsigned short reg, unsigned short old, new; old = snd_ac97_read_cache(ac97, reg); - new = (old & ~mask) | value; + new = (old & ~mask) | (value & mask); change = old != new; if (change) { ac97->regs[reg] = new; @@ -399,7 +399,7 @@ static int snd_ac97_ad18xx_update_pcm_bits(struct snd_ac97 *ac97, int codec, uns mutex_lock(&ac97->page_mutex); old = ac97->spec.ad18xx.pcmreg[codec]; - new = (old & ~mask) | value; + new = (old & ~mask) | (value & mask); change = old != new; if (change) { mutex_lock(&ac97->reg_mutex);