Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 32045
b: refs/heads/master
c: c6482dd
h: refs/heads/master
i:
  32043: 0327045
v: v3
  • Loading branch information
Arjan van de Ven authored and Linus Torvalds committed Jul 4, 2006
1 parent 5535168 commit 16744c2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a46f9484f8926aacb2e79a0e1676de3a6a6fbae8
refs/heads/master: c6482dde1c2811afba289b2344268f850595f350
5 changes: 3 additions & 2 deletions trunk/sound/pci/cs46xx/dsp_spos_scb_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ static void _dsp_clear_sample_buffer (struct snd_cs46xx *chip, u32 sample_buffer
void cs46xx_dsp_remove_scb (struct snd_cs46xx *chip, struct dsp_scb_descriptor * scb)
{
struct dsp_spos_instance * ins = chip->dsp_spos_instance;
unsigned long flags;

/* check integrety */
snd_assert ( (scb->index >= 0 &&
Expand All @@ -194,9 +195,9 @@ void cs46xx_dsp_remove_scb (struct snd_cs46xx *chip, struct dsp_scb_descriptor *
goto _end);
#endif

spin_lock(&scb->lock);
spin_lock_irqsave(&scb->lock, flags);
_dsp_unlink_scb (chip,scb);
spin_unlock(&scb->lock);
spin_unlock_irqrestore(&scb->lock, flags);

cs46xx_dsp_proc_free_scb_desc(scb);
snd_assert (scb->scb_symbol != NULL, return );
Expand Down

0 comments on commit 16744c2

Please sign in to comment.