hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ALSA: seq: Align temporary re-locking with irqsave version 

In a few places in sequencer core, we temporarily unlock / re-lock the
pool spin lock while waiting for the allocation in the blocking mode.
There spin_unlock_irq() / spin_lock_irq() pairs are called while
initially spin_lock_irqsave() is used (and spin_lock_irqrestore() at
the end of the function again).  This is likely OK for now, but it's a
bit confusing and error-prone.

This patch replaces these temporary relocking lines with the irqsave
variant to make the lock/unlock sequence more consistently.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2019-03-28 15:55:08 +01:00
parent fd7ae83de1
commit 4b24b960b1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/core/seq/seq_fifo.c
View File

@ -195,9 +195,9 @@ int snd_seq_fifo_cell_out(struct snd_seq_fifo *f,
} }
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
add_wait_queue(&f->input_sleep, &wait); add_wait_queue(&f->input_sleep, &wait);
spin_unlock_irq(&f->lock); spin_unlock_irqrestore(&f->lock, flags);
schedule(); schedule();
spin_lock_irq(&f->lock); spin_lock_irqsave(&f->lock, flags);
remove_wait_queue(&f->input_sleep, &wait); remove_wait_queue(&f->input_sleep, &wait);
if (signal_pending(current)) { if (signal_pending(current)) {
spin_unlock_irqrestore(&f->lock, flags); spin_unlock_irqrestore(&f->lock, flags);

4
sound/core/seq/seq_memory.c
View File

@ -244,13 +244,13 @@ static int snd_seq_cell_alloc(struct snd_seq_pool *pool,
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
add_wait_queue(&pool->output_sleep, &wait); add_wait_queue(&pool->output_sleep, &wait);
spin_unlock_irq(&pool->lock); spin_unlock_irqrestore(&pool->lock, flags);
if (mutexp) if (mutexp)
mutex_unlock(mutexp); mutex_unlock(mutexp);
schedule(); schedule();
if (mutexp) if (mutexp)
mutex_lock(mutexp); mutex_lock(mutexp);
spin_lock_irq(&pool->lock); spin_lock_irqsave(&pool->lock, flags);
remove_wait_queue(&pool->output_sleep, &wait); remove_wait_queue(&pool->output_sleep, &wait);
/* interrupted? */ /* interrupted? */
if (signal_pending(current)) { if (signal_pending(current)) {