diff options
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/hrtimer.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/core/hrtimer.c b/sound/core/hrtimer.c index 866c80c4499d..c1d285921f80 100644 --- a/sound/core/hrtimer.c +++ b/sound/core/hrtimer.c | |||
| @@ -57,7 +57,7 @@ static int snd_hrtimer_open(struct snd_timer *t) | |||
| 57 | return -ENOMEM; | 57 | return -ENOMEM; |
| 58 | hrtimer_init(&stime->hrt, CLOCK_MONOTONIC, HRTIMER_MODE_REL); | 58 | hrtimer_init(&stime->hrt, CLOCK_MONOTONIC, HRTIMER_MODE_REL); |
| 59 | stime->timer = t; | 59 | stime->timer = t; |
| 60 | stime->hrt.cb_mode = HRTIMER_CB_SOFTIRQ; | 60 | stime->hrt.cb_mode = HRTIMER_CB_IRQSAFE_UNLOCKED; |
| 61 | stime->hrt.function = snd_hrtimer_callback; | 61 | stime->hrt.function = snd_hrtimer_callback; |
| 62 | t->private_data = stime; | 62 | t->private_data = stime; |
| 63 | return 0; | 63 | return 0; |
| @@ -93,9 +93,7 @@ static int snd_hrtimer_stop(struct snd_timer *t) | |||
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | static struct snd_timer_hardware hrtimer_hw = { | 95 | static struct snd_timer_hardware hrtimer_hw = { |
| 96 | .flags = (SNDRV_TIMER_HW_AUTO | | 96 | .flags = SNDRV_TIMER_HW_AUTO, |
| 97 | /*SNDRV_TIMER_HW_FIRST |*/ | ||
| 98 | SNDRV_TIMER_HW_TASKLET), | ||
| 99 | .open = snd_hrtimer_open, | 97 | .open = snd_hrtimer_open, |
| 100 | .close = snd_hrtimer_close, | 98 | .close = snd_hrtimer_close, |
| 101 | .start = snd_hrtimer_start, | 99 | .start = snd_hrtimer_start, |