diff options
| author |   Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2023-04-28 11:59:38 +0200 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2023-05-08 09:21:54 +0200 |
| commit | 50164f69f8c71377bfa3d356b8a6bc18b2197a45 (patch) | |
| tree | 4de64566ef2cbb3e50e4ac2a16ff33b9f50639b6 /sound/pci/emu10k1/emumixer.c | |
| parent | ALSA: emu10k1: remove pointless locks from /proc code (diff) | |
| download | wireguard-linux-50164f69f8c71377bfa3d356b8a6bc18b2197a45.tar.xz wireguard-linux-50164f69f8c71377bfa3d356b8a6bc18b2197a45.zip | |
ALSA: emu10k1: use the right lock in snd_emu10k1_shared_spdif_put()
The function does read-modify-write cycles on the card's registers, and
doesn't access mutable members of the emu data structure.
I suppose this might have been a mixup due to the lock names being
logically swapped.
Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Link: https://lore.kernel.org/r/20230428095941.1706278-4-oswald.buddenhagen@gmx.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/emu10k1/emumixer.c')
| -rw-r--r-- | sound/pci/emu10k1/emumixer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index 3ebc7c36a444..24052f17d81c 100644 --- a/sound/pci/emu10k1/emumixer.c +++ b/sound/pci/emu10k1/emumixer.c @@ -1654,7 +1654,7 @@ static int snd_emu10k1_shared_spdif_put(struct snd_kcontrol *kcontrol, sw = ucontrol->value.integer.value[0]; if (emu->card_capabilities->invert_shared_spdif) sw = !sw; - spin_lock_irqsave(&emu->reg_lock, flags); + spin_lock_irqsave(&emu->emu_lock, flags); if ( emu->card_capabilities->i2c_adc) { /* Do nothing for Audigy 2 ZS Notebook */ } else if (emu->audigy) { @@ -1675,7 +1675,7 @@ static int snd_emu10k1_shared_spdif_put(struct snd_kcontrol *kcontrol, reg |= val; outl(reg | val, emu->port + HCFG); } - spin_unlock_irqrestore(&emu->reg_lock, flags); + spin_unlock_irqrestore(&emu->emu_lock, flags); return change; } |