summaryrefslogtreecommitdiff
path: root/sound/drivers
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-25 11:40:27 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-25 11:40:27 +0100
commit8afabfa74bbe81ac496e66f7f0ed8943dff5fdb5 (patch)
tree7c0eff65f827891fb4d9f8e46839207c71b26b93 /sound/drivers
parent86b3aa390b4b9925f16a21b98441fd7abdb9fff2 (diff)
parent1f04128a3db7c0f0e8b5d25323eba70ac342f47f (diff)
downloadlinux-3.10-8afabfa74bbe81ac496e66f7f0ed8943dff5fdb5.tar.gz
linux-3.10-8afabfa74bbe81ac496e66f7f0ed8943dff5fdb5.tar.bz2
linux-3.10-8afabfa74bbe81ac496e66f7f0ed8943dff5fdb5.zip
Merge branch 'topic/convert-tasklet' into to-push
Diffstat (limited to 'sound/drivers')
-rw-r--r--sound/drivers/vx/vx_core.c2
-rw-r--r--sound/drivers/vx/vx_pcm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/drivers/vx/vx_core.c b/sound/drivers/vx/vx_core.c
index 473b07f6ae8..14e3354be43 100644
--- a/sound/drivers/vx/vx_core.c
+++ b/sound/drivers/vx/vx_core.c
@@ -548,7 +548,7 @@ irqreturn_t snd_vx_irq_handler(int irq, void *dev)
(chip->chip_status & VX_STAT_IS_STALE))
return IRQ_NONE;
if (! vx_test_and_ack(chip))
- tasklet_hi_schedule(&chip->tq);
+ tasklet_schedule(&chip->tq);
return IRQ_HANDLED;
}
diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c
index 27de574c08f..6644d0034fb 100644
--- a/sound/drivers/vx/vx_pcm.c
+++ b/sound/drivers/vx/vx_pcm.c
@@ -823,7 +823,7 @@ static int vx_pcm_trigger(struct snd_pcm_substream *subs, int cmd)
* we trigger the pipe using tasklet, so that the interrupts are
* issued surely after the trigger is completed.
*/
- tasklet_hi_schedule(&pipe->start_tq);
+ tasklet_schedule(&pipe->start_tq);
chip->pcm_running++;
pipe->running = 1;
break;