lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: asihpi - Relax drained check for more reliable playback startup.

Browse Source 
Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Eliot Blennerhassett
2011-12-22 13:38:37 +13:00
committed by Takashi Iwai
parent 8e0874ea72
commit 0be55c453f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sound/pci/asihpi/asihpi.c
View File

@@ -759,8 +759,7 @@ static void snd_card_asihpi_timer_function(unsigned long data)
if (s->stream == SNDRV_PCM_STREAM_PLAYBACK) { if (s->stream == SNDRV_PCM_STREAM_PLAYBACK) {
pcm_buf_dma_ofs = ds->pcm_buf_host_rw_ofs - bytes_avail; pcm_buf_dma_ofs = ds->pcm_buf_host_rw_ofs - bytes_avail;
if (state == HPI_STATE_STOPPED) { if (state == HPI_STATE_STOPPED) {
if ((bytes_avail == 0) && if (bytes_avail == 0) {
(on_card_bytes < ds->pcm_buf_host_rw_ofs)) {
hpi_handle_error(hpi_stream_start(ds->h_stream)); hpi_handle_error(hpi_stream_start(ds->h_stream));
snd_printdd("P%d start\n", s->number); snd_printdd("P%d start\n", s->number);
ds->drained_count = 0; ds->drained_count = 0;
@@ -769,7 +768,7 @@ static void snd_card_asihpi_timer_function(unsigned long data)
snd_printd(KERN_WARNING "P%d drained\n", snd_printd(KERN_WARNING "P%d drained\n",
s->number); s->number);
ds->drained_count++; ds->drained_count++;
if (ds->drained_count > 2) { if (ds->drained_count > 20) {
snd_pcm_stop(s, SNDRV_PCM_STATE_XRUN); snd_pcm_stop(s, SNDRV_PCM_STATE_XRUN);
continue; continue;
} }