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

ALSA: ctxfi - Clear PCM resources at hw_params and hw_free 



Currently the PCM resources are allocated only once and ever in prepare
callback, assuming that the PCM parameters are never changed.  But it's
not true.

This patch adds the call of atc->pcm_release_resources() at hw_params
and hw_free callbacks to assure that the PCM setup is done correctly
for each h/w parameter changes.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 5242bc76

sound/pci/ctxfi/ctatc.c

+2 −2
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ atc_pcm_capture_get_resources(struct ct_atc *atc, struct ct_atc_pcm *apcm) 
	struct src_node_conf_t src_node_conf[2] = {{0} };



	/* first release old resources */

	atc->pcm_release_resources(atc, apcm);

	atc_pcm_release_resources(atc, apcm);



	/* The numbers of converting SRCs and SRCIMPs should be determined

	 * by pitch value. */
@@ -802,7 +802,7 @@ static int spdif_passthru_playback_get_resources(struct ct_atc *atc, 
	unsigned int pitch, rsr = atc->pll_rate;



	/* first release old resources */

	atc->pcm_release_resources(atc, apcm);

	atc_pcm_release_resources(atc, apcm);



	/* Get SRC resource */

	desc.multi = apcm->substream->runtime->channels;

sound/pci/ctxfi/ctpcm.c

+15 −1
Original line number Diff line number Diff line
@@ -176,12 +176,26 @@ static int ct_pcm_playback_close(struct snd_pcm_substream *substream) 
static int ct_pcm_hw_params(struct snd_pcm_substream *substream,

				     struct snd_pcm_hw_params *hw_params)

{

	return snd_pcm_lib_malloc_pages(substream,

	struct ct_atc *atc = snd_pcm_substream_chip(substream);

	struct ct_atc_pcm *apcm = substream->runtime->private_data;

	int err;



	err = snd_pcm_lib_malloc_pages(substream,

					params_buffer_bytes(hw_params));

	if (err < 0)

		return err;

	/* clear previous resources */

	atc->pcm_release_resources(atc, apcm);

	return err;

}



static int ct_pcm_hw_free(struct snd_pcm_substream *substream)

{

	struct ct_atc *atc = snd_pcm_substream_chip(substream);

	struct ct_atc_pcm *apcm = substream->runtime->private_data;



	/* clear previous resources */

	atc->pcm_release_resources(atc, apcm);

	/* Free snd-allocated pages */

	return snd_pcm_lib_free_pages(substream);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE