---

yaml --- r: 120573 b: refs/heads/master c: 5e03c54 h: refs/heads/master i: 120571: 75edaf2 v: v3
git-mirror · Dec 8, 2008 · 0480174 · 0480174
1 parent c314312
commit 0480174
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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,