]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ALSA: rme32: Deliver indirect-PCM transfer error
authorTakashi Iwai <tiwai@suse.de>
Fri, 19 May 2017 16:49:45 +0000 (18:49 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 25 May 2017 21:34:47 +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/rme32.c

index 96d15db65dfd28230e6514c7d2a833d41148ebca..f9b424056d0ffebc2a7d09abef3b2ed150be341c 100644 (file)
@@ -1157,9 +1157,8 @@ static int snd_rme32_playback_fd_ack(struct snd_pcm_substream *substream)
        if (rme32->running & (1 << SNDRV_PCM_STREAM_CAPTURE))
                rec->hw_queue_size -= cprec->hw_ready;
        spin_unlock(&rme32->lock);
-       snd_pcm_indirect_playback_transfer(substream, rec,
-                                          snd_rme32_pb_trans_copy);
-       return 0;
+       return snd_pcm_indirect_playback_transfer(substream, rec,
+                                                 snd_rme32_pb_trans_copy);
 }
 
 static void snd_rme32_cp_trans_copy(struct snd_pcm_substream *substream,
@@ -1174,9 +1173,8 @@ static void snd_rme32_cp_trans_copy(struct snd_pcm_substream *substream,
 static int snd_rme32_capture_fd_ack(struct snd_pcm_substream *substream)
 {
        struct rme32 *rme32 = snd_pcm_substream_chip(substream);
-       snd_pcm_indirect_capture_transfer(substream, &rme32->capture_pcm,
-                                         snd_rme32_cp_trans_copy);
-       return 0;
+       return snd_pcm_indirect_capture_transfer(substream, &rme32->capture_pcm,
+                                                snd_rme32_cp_trans_copy);
 }
 
 static snd_pcm_uframes_t