summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2011-02-10 16:16:32 +0100
committerTakashi Iwai <tiwai@suse.de>2011-02-10 18:53:32 +0100
commit2243c4d0727ad85aff3f54be9d178632cc9234b2 (patch)
tree7f623925bbc6c44072de689d2b915e567f163c7a /sound
parentb1d4f7f4bdcf9915c41ff8cfc4425c84dabb1fde (diff)
downloadlinux-stable-2243c4d0727ad85aff3f54be9d178632cc9234b2.tar.gz
linux-stable-2243c4d0727ad85aff3f54be9d178632cc9234b2.tar.bz2
linux-stable-2243c4d0727ad85aff3f54be9d178632cc9234b2.zip
ALSA: hrtimer: remove superfluous tasklet invocation
Commit bb758e9637e5ddc removed snd_hrtimer_callback() from the hardware interrupt handler, thus moving it into a tasklet, but did not tell the ALSA timer framework about this, so the timer handling would now be done in the ALSA timer tasklet scheduled from another tasklet. To fix this, add the flag to tell the ALSA timer framework that the timer handler is already being invoked in a tasklet. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/hrtimer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/hrtimer.c b/sound/core/hrtimer.c
index 07efa29dfd4a..b8b31c433d64 100644
--- a/sound/core/hrtimer.c
+++ b/sound/core/hrtimer.c
@@ -105,7 +105,7 @@ static int snd_hrtimer_stop(struct snd_timer *t)
}
static struct snd_timer_hardware hrtimer_hw = {
- .flags = SNDRV_TIMER_HW_AUTO,
+ .flags = SNDRV_TIMER_HW_AUTO | SNDRV_TIMER_HW_TASKLET,
.open = snd_hrtimer_open,
.close = snd_hrtimer_close,
.start = snd_hrtimer_start,