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

Commit cebf6bfe authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: cs46xx: 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 0f21e57d

sound/pci/cs46xx/cs46xx_lib.c

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