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/pci/pcxhr | |
parent | 86b3aa390b4b9925f16a21b98441fd7abdb9fff2 (diff) | |
parent | 1f04128a3db7c0f0e8b5d25323eba70ac342f47f (diff) |
Merge branch 'topic/convert-tasklet' into to-push
Diffstat (limited to 'sound/pci/pcxhr')
-rw-r--r-- | sound/pci/pcxhr/pcxhr.c | 2 | ||||
-rw-r--r-- | sound/pci/pcxhr/pcxhr_core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c index 7d2b136295d5..471ee27e6c8a 100644 --- a/sound/pci/pcxhr/pcxhr.c +++ b/sound/pci/pcxhr/pcxhr.c | |||
@@ -653,7 +653,7 @@ static int pcxhr_trigger(struct snd_pcm_substream *subs, int cmd) | |||
653 | PCXHR_STREAM_STATUS_SCHEDULE_RUN; | 653 | PCXHR_STREAM_STATUS_SCHEDULE_RUN; |
654 | snd_pcm_trigger_done(s, subs); | 654 | snd_pcm_trigger_done(s, subs); |
655 | } | 655 | } |
656 | tasklet_hi_schedule(&chip->mgr->trigger_taskq); | 656 | tasklet_schedule(&chip->mgr->trigger_taskq); |
657 | } else { | 657 | } else { |
658 | stream = subs->runtime->private_data; | 658 | stream = subs->runtime->private_data; |
659 | snd_printdd("Only one Substream %c %d\n", | 659 | snd_printdd("Only one Substream %c %d\n", |
diff --git a/sound/pci/pcxhr/pcxhr_core.c b/sound/pci/pcxhr/pcxhr_core.c index 7143259cfe34..4a5481f9781f 100644 --- a/sound/pci/pcxhr/pcxhr_core.c +++ b/sound/pci/pcxhr/pcxhr_core.c | |||
@@ -1213,7 +1213,7 @@ irqreturn_t pcxhr_interrupt(int irq, void *dev_id) | |||
1213 | mgr->dsp_time_last = PCXHR_DSP_TIME_INVALID; | 1213 | mgr->dsp_time_last = PCXHR_DSP_TIME_INVALID; |
1214 | 1214 | ||
1215 | mgr->src_it_dsp = reg; | 1215 | mgr->src_it_dsp = reg; |
1216 | tasklet_hi_schedule(&mgr->msg_taskq); | 1216 | tasklet_schedule(&mgr->msg_taskq); |
1217 | } | 1217 | } |
1218 | #ifdef CONFIG_SND_DEBUG_VERBOSE | 1218 | #ifdef CONFIG_SND_DEBUG_VERBOSE |
1219 | if (reg & PCXHR_FATAL_DSP_ERR) | 1219 | if (reg & PCXHR_FATAL_DSP_ERR) |