From: Bryan Wu <cooloney@kernel.org> To: broonie@opensource.wolfsonmicro.com Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Cliff Cai <cliff.cai@analog.com>, Bryan Wu <cooloney@kernel.org> Subject: [PATCH 2/5] ASoC: ssm2602 codec: fix bug - kernel will crash when record and play in bf527-ezkit Date: Fri, 6 Mar 2009 15:53:27 +0800 [thread overview] Message-ID: <1236326010-683-3-git-send-email-cooloney@kernel.org> (raw) In-Reply-To: <1236326010-683-1-git-send-email-cooloney@kernel.org> From: Cliff Cai <cliff.cai@analog.com> set constraint only if the value is not 0, change the configuring way for sport Signed-off-by: Cliff Cai <cliff.cai@analog.com> Signed-off-by: Bryan Wu <cooloney@kernel.org> --- sound/soc/codecs/ssm2602.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index cac3736..3fdba6a 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -49,8 +49,8 @@ struct snd_soc_codec_device soc_codec_dev_ssm2602; /* codec private data */ struct ssm2602_priv { unsigned int sysclk; - struct snd_pcm_substream *master_substream; - struct snd_pcm_substream *slave_substream; + unsigned int master_rate; + unsigned int master_sample_bits; }; /* @@ -339,31 +339,30 @@ static int ssm2602_startup(struct snd_pcm_substream *substream, struct snd_soc_codec *codec = socdev->codec; struct ssm2602_priv *ssm2602 = codec->private_data; struct i2c_client *i2c = codec->control_data; - struct snd_pcm_runtime *master_runtime; /* The DAI has shared clocks so if we already have a playback or * capture going then constrain this substream to match it. * TODO: the ssm2602 allows pairs of non-matching PB/REC rates */ - if (ssm2602->master_substream) { - master_runtime = ssm2602->master_substream->runtime; + if (ssm2602->master_rate) { dev_dbg(&i2c->dev, "Constraining to %d bits at %dHz\n", - master_runtime->sample_bits, - master_runtime->rate); + ssm2602->master_sample_bits, + ssm2602->master_rate); snd_pcm_hw_constraint_minmax(substream->runtime, SNDRV_PCM_HW_PARAM_RATE, - master_runtime->rate, - master_runtime->rate); - + ssm2602->master_rate, + ssm2602->master_rate); + } else + ssm2602->master_rate = substream->runtime->rate; + + if (ssm2602->master_sample_bits) { snd_pcm_hw_constraint_minmax(substream->runtime, SNDRV_PCM_HW_PARAM_SAMPLE_BITS, - master_runtime->sample_bits, - master_runtime->sample_bits); - - ssm2602->slave_substream = substream; + ssm2602->master_sample_bits, + ssm2602->master_sample_bits); } else - ssm2602->master_substream = substream; + ssm2602->master_sample_bits = substream->runtime->sample_bits; return 0; } -- 1.5.6.3
WARNING: multiple messages have this Message-ID (diff)
From: Bryan Wu <cooloney@kernel.org> To: broonie@opensource.wolfsonmicro.com Cc: Cliff Cai <cliff.cai@analog.com>, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Bryan Wu <cooloney@kernel.org> Subject: [PATCH 2/5] ASoC: ssm2602 codec: fix bug - kernel will crash when record and play in bf527-ezkit Date: Fri, 6 Mar 2009 15:53:27 +0800 [thread overview] Message-ID: <1236326010-683-3-git-send-email-cooloney@kernel.org> (raw) In-Reply-To: <1236326010-683-1-git-send-email-cooloney@kernel.org> From: Cliff Cai <cliff.cai@analog.com> set constraint only if the value is not 0, change the configuring way for sport Signed-off-by: Cliff Cai <cliff.cai@analog.com> Signed-off-by: Bryan Wu <cooloney@kernel.org> --- sound/soc/codecs/ssm2602.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index cac3736..3fdba6a 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -49,8 +49,8 @@ struct snd_soc_codec_device soc_codec_dev_ssm2602; /* codec private data */ struct ssm2602_priv { unsigned int sysclk; - struct snd_pcm_substream *master_substream; - struct snd_pcm_substream *slave_substream; + unsigned int master_rate; + unsigned int master_sample_bits; }; /* @@ -339,31 +339,30 @@ static int ssm2602_startup(struct snd_pcm_substream *substream, struct snd_soc_codec *codec = socdev->codec; struct ssm2602_priv *ssm2602 = codec->private_data; struct i2c_client *i2c = codec->control_data; - struct snd_pcm_runtime *master_runtime; /* The DAI has shared clocks so if we already have a playback or * capture going then constrain this substream to match it. * TODO: the ssm2602 allows pairs of non-matching PB/REC rates */ - if (ssm2602->master_substream) { - master_runtime = ssm2602->master_substream->runtime; + if (ssm2602->master_rate) { dev_dbg(&i2c->dev, "Constraining to %d bits at %dHz\n", - master_runtime->sample_bits, - master_runtime->rate); + ssm2602->master_sample_bits, + ssm2602->master_rate); snd_pcm_hw_constraint_minmax(substream->runtime, SNDRV_PCM_HW_PARAM_RATE, - master_runtime->rate, - master_runtime->rate); - + ssm2602->master_rate, + ssm2602->master_rate); + } else + ssm2602->master_rate = substream->runtime->rate; + + if (ssm2602->master_sample_bits) { snd_pcm_hw_constraint_minmax(substream->runtime, SNDRV_PCM_HW_PARAM_SAMPLE_BITS, - master_runtime->sample_bits, - master_runtime->sample_bits); - - ssm2602->slave_substream = substream; + ssm2602->master_sample_bits, + ssm2602->master_sample_bits); } else - ssm2602->master_substream = substream; + ssm2602->master_sample_bits = substream->runtime->sample_bits; return 0; } -- 1.5.6.3
next prev parent reply other threads:[~2009-03-06 7:51 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2009-03-06 7:53 [PATCH 0/5] Blackfin ASoC fixing and updates Bryan Wu 2009-03-06 7:53 ` [PATCH 1/5] ASoC: Blackfin: fix bug - kernel will crash when record and play in bf527-ezkit Bryan Wu 2009-03-06 7:53 ` Bryan Wu 2009-03-06 12:01 ` [alsa-devel] " Mark Brown 2009-03-06 12:01 ` Mark Brown 2009-03-09 10:58 ` [alsa-devel] [PATCH 1/5] ASoC: Blackfin: fix bug - kernel willcrash " Cai, Cliff 2009-03-09 10:58 ` Cai, Cliff 2009-03-09 11:21 ` [alsa-devel] " Mark Brown 2009-03-09 11:21 ` Mark Brown 2009-03-10 9:45 ` [alsa-devel] [PATCH 1/5] ASoC: Blackfin: fix bug - kernelwillcrash " Cai, Cliff 2009-03-10 9:45 ` Cai, Cliff 2009-03-06 7:53 ` Bryan Wu [this message] 2009-03-06 7:53 ` [PATCH 2/5] ASoC: ssm2602 codec: fix bug - kernel will crash " Bryan Wu 2009-03-06 9:50 ` [alsa-devel] " Karl Beldan 2009-03-06 9:50 ` Karl Beldan 2009-03-06 12:35 ` [alsa-devel] " Mark Brown 2009-03-06 12:35 ` Mark Brown 2009-03-09 11:07 ` [alsa-devel] [PATCH 2/5] ASoC: ssm2602 codec: fix bug - kernelwill " Cai, Cliff 2009-03-09 11:07 ` Cai, Cliff 2009-03-09 11:55 ` Mark Brown 2009-03-09 11:55 ` Mark Brown 2009-03-06 7:53 ` [PATCH 3/5] ASoC: Blackfin: move gpio_err behind the define that is only user of it Bryan Wu 2009-03-06 11:13 ` [alsa-devel] " Mark Brown 2009-03-06 11:13 ` Mark Brown 2009-03-06 7:53 ` [PATCH 4/5] ASoC: Blackfin: drop pointless casts due to dma updates Bryan Wu 2009-03-06 11:10 ` [alsa-devel] " Mark Brown 2009-03-06 11:10 ` Mark Brown 2009-03-08 4:28 ` [alsa-devel] " Bryan Wu 2009-03-08 4:28 ` Bryan Wu 2009-03-06 7:53 ` [PATCH 5/5] ASoC: Blackfin: fix typo in MUTE definition Bryan Wu 2009-03-06 11:15 ` [alsa-devel] " Mark Brown 2009-03-06 11:15 ` Mark Brown
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1236326010-683-3-git-send-email-cooloney@kernel.org \ --to=cooloney@kernel.org \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@opensource.wolfsonmicro.com \ --cc=cliff.cai@analog.com \ --cc=linux-kernel@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.