summaryrefslogtreecommitdiffstats
path: root/sound/mips
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-05-19 12:41:45 -0400
committerTakashi Iwai <tiwai@suse.de>2017-05-25 17:34:46 -0400
commit0f21e57decaa2c49ace8436781cd4672d3637ddc (patch)
treee5939822eed8dab274002e64439950e23f6ec993 /sound/mips
parent9629581258cb520a413a4240fc4254a45e0a81df (diff)
ALSA: mips: Deliver indirect-PCM transfer error
Now that the indirect-PCM transfer helper gives back an error, we should return the error from ack callbacks. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/mips')
-rw-r--r--sound/mips/hal2.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c
index 00fc9241d266..684dc4ddef41 100644
--- a/sound/mips/hal2.c
+++ b/sound/mips/hal2.c
@@ -616,10 +616,9 @@ static int hal2_playback_ack(struct snd_pcm_substream *substream)
616 struct hal2_codec *dac = &hal2->dac; 616 struct hal2_codec *dac = &hal2->dac;
617 617
618 dac->pcm_indirect.hw_queue_size = H2_BUF_SIZE / 2; 618 dac->pcm_indirect.hw_queue_size = H2_BUF_SIZE / 2;
619 snd_pcm_indirect_playback_transfer(substream, 619 return snd_pcm_indirect_playback_transfer(substream,
620 &dac->pcm_indirect, 620 &dac->pcm_indirect,
621 hal2_playback_transfer); 621 hal2_playback_transfer);
622 return 0;
623} 622}
624 623
625static int hal2_capture_open(struct snd_pcm_substream *substream) 624static int hal2_capture_open(struct snd_pcm_substream *substream)
@@ -707,10 +706,9 @@ static int hal2_capture_ack(struct snd_pcm_substream *substream)
707 struct snd_hal2 *hal2 = snd_pcm_substream_chip(substream); 706 struct snd_hal2 *hal2 = snd_pcm_substream_chip(substream);
708 struct hal2_codec *adc = &hal2->adc; 707 struct hal2_codec *adc = &hal2->adc;
709 708
710 snd_pcm_indirect_capture_transfer(substream, 709 return snd_pcm_indirect_capture_transfer(substream,
711 &adc->pcm_indirect, 710 &adc->pcm_indirect,
712 hal2_capture_transfer); 711 hal2_capture_transfer);
713 return 0;
714} 712}
715 713
716static struct snd_pcm_ops hal2_playback_ops = { 714static struct snd_pcm_ops hal2_playback_ops = {