]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ALSA: cs46xx: Deliver indirect-PCM transfer error
authorTakashi Iwai <tiwai@suse.de>
Fri, 19 May 2017 16:48:36 +0000 (18:48 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 25 May 2017 21:34:46 +0000 (23:34 +0200)
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>
sound/pci/cs46xx/cs46xx_lib.c

index 00fa52e9a2f2609122252eb17df7655bc9baaeeb..ae2aad52ea6f874df90f474dbc1abab3b9fbfbbc 100644 (file)
@@ -887,8 +887,8 @@ static int snd_cs46xx_playback_transfer(struct snd_pcm_substream *substream)
 {
        struct snd_pcm_runtime *runtime = substream->runtime;
        struct snd_cs46xx_pcm * cpcm = runtime->private_data;
-       snd_pcm_indirect_playback_transfer(substream, &cpcm->pcm_rec, snd_cs46xx_pb_trans_copy);
-       return 0;
+       return snd_pcm_indirect_playback_transfer(substream, &cpcm->pcm_rec,
+                                                 snd_cs46xx_pb_trans_copy);
 }
 
 static void snd_cs46xx_cp_trans_copy(struct snd_pcm_substream *substream,
@@ -903,8 +903,8 @@ static void snd_cs46xx_cp_trans_copy(struct snd_pcm_substream *substream,
 static int snd_cs46xx_capture_transfer(struct snd_pcm_substream *substream)
 {
        struct snd_cs46xx *chip = snd_pcm_substream_chip(substream);
-       snd_pcm_indirect_capture_transfer(substream, &chip->capt.pcm_rec, snd_cs46xx_cp_trans_copy);
-       return 0;
+       return snd_pcm_indirect_capture_transfer(substream, &chip->capt.pcm_rec,
+                                                snd_cs46xx_cp_trans_copy);
 }
 
 static snd_pcm_uframes_t snd_cs46xx_playback_direct_pointer(struct snd_pcm_substream *substream)