diff options
| author | James Morris <jmorris@namei.org> | 2010-05-06 22:21:04 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-06 22:21:04 +1000 |
| commit | 043b4d40f53131c5f72eca2a46555fe35328a930 (patch) | |
| tree | 02a40eeb688f7ed9730e26a22f39ad7e04378de2 /sound/core/timer.c | |
| parent | 292823814261e085cdcef06b6b691e6c2563fbd4 (diff) | |
| parent | 722154e4cacf015161efe60009ae9be23d492296 (diff) | |
| download | linux-043b4d40f53131c5f72eca2a46555fe35328a930.tar.gz linux-043b4d40f53131c5f72eca2a46555fe35328a930.tar.bz2 linux-043b4d40f53131c5f72eca2a46555fe35328a930.zip | |
Merge branch 'master' into next
Conflicts:
security/keys/keyring.c
Resolved conflict with whitespace fix in find_keyring_by_name()
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'sound/core/timer.c')
| -rw-r--r-- | sound/core/timer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 73943651caed..5040c7b862fe 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -1160,6 +1160,7 @@ static void snd_timer_user_ccallback(struct snd_timer_instance *timeri, { struct snd_timer_user *tu = timeri->callback_data; struct snd_timer_tread r1; + unsigned long flags; if (event >= SNDRV_TIMER_EVENT_START && event <= SNDRV_TIMER_EVENT_PAUSE) @@ -1169,9 +1170,9 @@ static void snd_timer_user_ccallback(struct snd_timer_instance *timeri, r1.event = event; r1.tstamp = *tstamp; r1.val = resolution; - spin_lock(&tu->qlock); + spin_lock_irqsave(&tu->qlock, flags); snd_timer_user_append_to_tqueue(tu, &r1); - spin_unlock(&tu->qlock); + spin_unlock_irqrestore(&tu->qlock, flags); kill_fasync(&tu->fasync, SIGIO, POLL_IN); wake_up(&tu->qchange_sleep); } |