Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6.git] / sound / core / hrtimer.c
index 866c80c..34c7d48 100644 (file)
@@ -57,7 +57,6 @@ 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.function = snd_hrtimer_callback;
        t->private_data = stime;
        return 0;
@@ -93,9 +92,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,