Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-07 13:53:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALSA: rme32: Deliver indirect-PCM transfer error

Browse Source 
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>
This commit is contained in:
Takashi Iwai 2017-05-19 18:49:45 +02:00
parent 00277e2b5f
commit 3e02c5a60e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/pci/rme32.c
View 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)) if (rme32->running & (1 << SNDRV_PCM_STREAM_CAPTURE))
rec->hw_queue_size -= cprec->hw_ready; rec->hw_queue_size -= cprec->hw_ready;
spin_unlock(&rme32->lock); spin_unlock(&rme32->lock);
snd_pcm_indirect_playback_transfer(substream, rec, return snd_pcm_indirect_playback_transfer(substream, rec,
snd_rme32_pb_trans_copy); snd_rme32_pb_trans_copy);
return 0;
} }
static void snd_rme32_cp_trans_copy(struct snd_pcm_substream *substream, 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) static int snd_rme32_capture_fd_ack(struct snd_pcm_substream *substream)
{ {
struct rme32 *rme32 = snd_pcm_substream_chip(substream); struct rme32 *rme32 = snd_pcm_substream_chip(substream);
snd_pcm_indirect_capture_transfer(substream, &rme32->capture_pcm, return snd_pcm_indirect_capture_transfer(substream, &rme32->capture_pcm,
snd_rme32_cp_trans_copy); snd_rme32_cp_trans_copy);
return 0;
} }
static snd_pcm_uframes_t static snd_pcm_uframes_t