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

Commit e8bb036a authored by James C Georgas's avatar James C Georgas Committed by Jaroslav Kysela
Browse files

[ALSA] ac97_codec - trivial fix for bit update functions 



This patch fixes a couple of bit update functions in
alsa-kernel/pci/ac97/ac97_codec.c, which could possibly corrupt bits not
in the given mask.
Specifically, it'll clobber unset bits in the target that are not in the
mask, when the corresponding bit in the given new value is set.

Signed-off-by: default avatarJames C Georgas <jgeorgas@rogers.com>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent d5f6a38d

sound/pci/ac97/ac97_codec.c

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