From 04801744b2340a56b61e17c783204cd2b7237176 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 8 Dec 2008 12:40:56 +0100 Subject: [PATCH] --- yaml --- r: 120573 b: refs/heads/master c: 5e03c54eeb016cf1b066e9e48d30116814ca2459 h: refs/heads/master i: 120571: 75edaf27ae9031b208f7e9f5d7655e874ac2e89b v: v3 --- [refs] | 2 +- trunk/sound/core/hrtimer.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 253678c4b1e5..3c9ee3222546 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 647808a6b932d85c3e85df6dcf0e34c1e53cc953 +refs/heads/master: 5e03c54eeb016cf1b066e9e48d30116814ca2459 diff --git a/trunk/sound/core/hrtimer.c b/trunk/sound/core/hrtimer.c index 866c80c4499d..c1d285921f80 100644 --- a/trunk/sound/core/hrtimer.c +++ b/trunk/sound/core/hrtimer.c @@ -57,7 +57,7 @@ static int snd_hrtimer_open(struct snd_timer *t) return -ENOMEM; hrtimer_init(&stime->hrt, CLOCK_MONOTONIC, HRTIMER_MODE_REL); stime->timer = t; - stime->hrt.cb_mode = HRTIMER_CB_SOFTIRQ; + stime->hrt.cb_mode = HRTIMER_CB_IRQSAFE_UNLOCKED; stime->hrt.function = snd_hrtimer_callback; t->private_data = stime; return 0; @@ -93,9 +93,7 @@ static int snd_hrtimer_stop(struct snd_timer *t) } static struct snd_timer_hardware hrtimer_hw = { - .flags = (SNDRV_TIMER_HW_AUTO | - /*SNDRV_TIMER_HW_FIRST |*/ - SNDRV_TIMER_HW_TASKLET), + .flags = SNDRV_TIMER_HW_AUTO, .open = snd_hrtimer_open, .close = snd_hrtimer_close, .start = snd_hrtimer_start,