diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-25 05:40:27 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-25 05:40:27 -0500 |
commit | 8afabfa74bbe81ac496e66f7f0ed8943dff5fdb5 (patch) | |
tree | 7c0eff65f827891fb4d9f8e46839207c71b26b93 /sound/drivers | |
parent | 86b3aa390b4b9925f16a21b98441fd7abdb9fff2 (diff) | |
parent | 1f04128a3db7c0f0e8b5d25323eba70ac342f47f (diff) |
Merge branch 'topic/convert-tasklet' into to-push
Diffstat (limited to 'sound/drivers')
-rw-r--r-- | sound/drivers/vx/vx_core.c | 2 | ||||
-rw-r--r-- | sound/drivers/vx/vx_pcm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/drivers/vx/vx_core.c b/sound/drivers/vx/vx_core.c index 473b07f6ae85..14e3354be43a 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) | |||
548 | (chip->chip_status & VX_STAT_IS_STALE)) | 548 | (chip->chip_status & VX_STAT_IS_STALE)) |
549 | return IRQ_NONE; | 549 | return IRQ_NONE; |
550 | if (! vx_test_and_ack(chip)) | 550 | if (! vx_test_and_ack(chip)) |
551 | tasklet_hi_schedule(&chip->tq); | 551 | tasklet_schedule(&chip->tq); |
552 | return IRQ_HANDLED; | 552 | return IRQ_HANDLED; |
553 | } | 553 | } |
554 | 554 | ||
diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c index 27de574c08f7..6644d0034fba 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) | |||
823 | * we trigger the pipe using tasklet, so that the interrupts are | 823 | * we trigger the pipe using tasklet, so that the interrupts are |
824 | * issued surely after the trigger is completed. | 824 | * issued surely after the trigger is completed. |
825 | */ | 825 | */ |
826 | tasklet_hi_schedule(&pipe->start_tq); | 826 | tasklet_schedule(&pipe->start_tq); |
827 | chip->pcm_running++; | 827 | chip->pcm_running++; |
828 | pipe->running = 1; | 828 | pipe->running = 1; |
829 | break; | 829 | break; |