From 0ff16ec42b91362cd02d7870fcec456bec27c9be Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 2 Jun 2009 14:12:17 +0200 Subject: [PATCH] --- yaml --- r: 148359 b: refs/heads/master c: 822fa19b5c23746577687a0ec48eae0ec1cd22a0 h: refs/heads/master i: 148357: 53fa5810e7a541df4c17dcc6238e08af3f67e477 148355: c2248eec59ac87ea79c1ccd8e49d190d2a0c5bd4 148351: b8d7b38ede0a9fcaefa9a248382c6cc9b1fbc2b3 v: v3 --- [refs] | 2 +- trunk/sound/pci/ctxfi/ctatc.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4ff4ec3a36f9..3ac398906913 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a4259bf89d23bfd58d87e275ef6da29cea6b3c5 +refs/heads/master: 822fa19b5c23746577687a0ec48eae0ec1cd22a0 diff --git a/trunk/sound/pci/ctxfi/ctatc.c b/trunk/sound/pci/ctxfi/ctatc.c index 1a4bb357eaef..e14ed714721b 100644 --- a/trunk/sound/pci/ctxfi/ctatc.c +++ b/trunk/sound/pci/ctxfi/ctatc.c @@ -254,6 +254,9 @@ static int atc_pcm_playback_prepare(struct ct_atc *atc, struct ct_atc_pcm *apcm) return 0; } + /* first release old resources */ + atc->pcm_release_resources(atc, apcm); + /* Get SRC resource */ desc.multi = apcm->substream->runtime->channels; desc.msr = atc->msr; @@ -496,6 +499,9 @@ atc_pcm_capture_get_resources(struct ct_atc *atc, struct ct_atc_pcm *apcm) int n_srcimp = 0, n_amixer = 0, n_srcc = 0, n_sum = 0; struct src_node_conf_t src_node_conf[2] = {{0} }; + /* first release old resources */ + atc->pcm_release_resources(atc, apcm); + /* The numbers of converting SRCs and SRCIMPs should be determined * by pitch value. */ @@ -767,6 +773,9 @@ static int spdif_passthru_playback_get_resources(struct ct_atc *atc, int n_amixer = apcm->substream->runtime->channels, i = 0; unsigned int pitch = 0, rsr = atc->pll_rate; + /* first release old resources */ + atc->pcm_release_resources(atc, apcm); + /* Get SRC resource */ desc.multi = apcm->substream->runtime->channels; desc.msr = 1;