Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e02c5a6 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: rme32: 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: default avatarTakashi Iwai <tiwai@suse.de>
parent 00277e2b

sound/pci/rme32.c

+4 −6
Original line number Diff line number Diff line
@@ -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,

	return snd_pcm_indirect_playback_transfer(substream, rec,

						  snd_rme32_pb_trans_copy);

	return 0;

}



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,

	return snd_pcm_indirect_capture_transfer(substream, &rme32->capture_pcm,

						 snd_rme32_cp_trans_copy);

	return 0;

}



static snd_pcm_uframes_t