diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-25 11:40:27 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-25 11:40:27 +0100 |
| commit | 8afabfa74bbe81ac496e66f7f0ed8943dff5fdb5 (patch) | |
| tree | 7c0eff65f827891fb4d9f8e46839207c71b26b93 /sound/pci/pcxhr | |
| parent | 86b3aa390b4b9925f16a21b98441fd7abdb9fff2 (diff) | |
| parent | 1f04128a3db7c0f0e8b5d25323eba70ac342f47f (diff) | |
| download | linux-8afabfa74bbe81ac496e66f7f0ed8943dff5fdb5.tar.gz linux-8afabfa74bbe81ac496e66f7f0ed8943dff5fdb5.tar.bz2 linux-8afabfa74bbe81ac496e66f7f0ed8943dff5fdb5.zip | |
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) PCXHR_STREAM_STATUS_SCHEDULE_RUN; snd_pcm_trigger_done(s, subs); } - tasklet_hi_schedule(&chip->mgr->trigger_taskq); + tasklet_schedule(&chip->mgr->trigger_taskq); } else { stream = subs->runtime->private_data; 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) mgr->dsp_time_last = PCXHR_DSP_TIME_INVALID; mgr->src_it_dsp = reg; - tasklet_hi_schedule(&mgr->msg_taskq); + tasklet_schedule(&mgr->msg_taskq); } #ifdef CONFIG_SND_DEBUG_VERBOSE if (reg & PCXHR_FATAL_DSP_ERR) |