diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-07-21 19:03:22 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-07-21 19:03:22 +0200 |
commit | 44f167d376aa42d59d40406036e901a5cf03567f (patch) | |
tree | 6ba4b322481ee5ddbc81ad23a42d6f2ca902855e /sound/isa/gus | |
parent | a9d90c81b536cc0567bdf22a8aaefe180a5b0f7a (diff) | |
parent | 34fdeb2d07102e07ecafe79dec170bd6733f2e56 (diff) |
Merge branch 'fix/misc' into for-linus
* fix/misc:
ALSA: ca0106 - Fix the max capture buffer size
ALSA: OSS sequencer should be initialized after snd_seq_system_client_init
ALSA: sound/isa: convert nested spin_lock_irqsave to spin_lock
Diffstat (limited to 'sound/isa/gus')
-rw-r--r-- | sound/isa/gus/gus_pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c index edb11eefdfe..2dcf45bf729 100644 --- a/sound/isa/gus/gus_pcm.c +++ b/sound/isa/gus/gus_pcm.c @@ -795,13 +795,13 @@ static int snd_gf1_pcm_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_ if (!(pcmp->flags & SNDRV_GF1_PCM_PFLG_ACTIVE)) continue; /* load real volume - better precision */ - spin_lock_irqsave(&gus->reg_lock, flags); + spin_lock(&gus->reg_lock); snd_gf1_select_voice(gus, pvoice->number); snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL); vol = pvoice == pcmp->pvoices[0] ? gus->gf1.pcm_volume_level_left : gus->gf1.pcm_volume_level_right; snd_gf1_write16(gus, SNDRV_GF1_VW_VOLUME, vol); pcmp->final_volume = 1; - spin_unlock_irqrestore(&gus->reg_lock, flags); + spin_unlock(&gus->reg_lock); } spin_unlock_irqrestore(&gus->voice_alloc, flags); return change; |