From: Dong Aisheng-B29396 <B29396@freescale.com> To: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>, "s.hauer@pengutronix.de" <s.hauer@pengutronix.de>, "lrg@ti.com" <lrg@ti.com>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, "u.kleine-koenig@pengutronix.de" <u.kleine-koenig@pengutronix.de> Subject: Re: [PATCH V2 01/10] ASoc: mxs: add mxs-pcm driver Date: Wed, 13 Jul 2011 06:29:48 +0000 [thread overview] Message-ID: <65EE16ACC360FA4D99C96DC085B3F7721CD7EC@039-SN1MPN1-002.039d.mgd.msft.net> (raw) In-Reply-To: <20110712232719.GB17710@opensource.wolfsonmicro.com> > -----Original Message----- > From: Mark Brown [mailto:broonie@opensource.wolfsonmicro.com] > Sent: Wednesday, July 13, 2011 7:27 AM > To: Dong Aisheng-B29396 > Cc: alsa-devel@alsa-project.org; linux-arm-kernel@lists.infradead.org; > lrg@ti.com; s.hauer@pengutronix.de; u.kleine-koenig@pengutronix.de > Subject: Re: [PATCH V2 01/10] ASoc: mxs: add mxs-pcm driver > > On Tue, Jul 12, 2011 at 11:04:36PM +0800, Dong Aisheng wrote: > > > + if (dai->driver->capture.channels_min) { > > + ret = mxs_pcm_preallocate_dma_buffer(pcm, > > + SNDRV_PCM_STREAM_CAPTURE); > > + if (ret) > > + goto out; > > + } > > For robustness replace the channels_min check with a check for the > relevant substream being present (see pxa2xx-pcm.c for a recent example). Is this change ok? diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c index 3e3a8c8..a385ba9 100644 --- a/sound/soc/mxs/mxs-pcm.c +++ b/sound/soc/mxs/mxs-pcm.c @@ -288,14 +288,14 @@ static int mxs_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, card->dev->dma_mask = &mxs_pcm_dmamask; if (!card->dev->coherent_dma_mask) card->dev->coherent_dma_mask = DMA_BIT_MASK(32); - if (dai->driver->playback.channels_min) { + if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { ret = mxs_pcm_preallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_PLAYBACK); if (ret) goto out; } - if (dai->driver->capture.channels_min) { + if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) { ret = mxs_pcm_preallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_CAPTURE); if (ret) Regards Dong Aisheng
WARNING: multiple messages have this Message-ID (diff)
From: B29396@freescale.com (Dong Aisheng-B29396) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V2 01/10] ASoc: mxs: add mxs-pcm driver Date: Wed, 13 Jul 2011 06:29:48 +0000 [thread overview] Message-ID: <65EE16ACC360FA4D99C96DC085B3F7721CD7EC@039-SN1MPN1-002.039d.mgd.msft.net> (raw) In-Reply-To: <20110712232719.GB17710@opensource.wolfsonmicro.com> > -----Original Message----- > From: Mark Brown [mailto:broonie at opensource.wolfsonmicro.com] > Sent: Wednesday, July 13, 2011 7:27 AM > To: Dong Aisheng-B29396 > Cc: alsa-devel at alsa-project.org; linux-arm-kernel at lists.infradead.org; > lrg at ti.com; s.hauer at pengutronix.de; u.kleine-koenig at pengutronix.de > Subject: Re: [PATCH V2 01/10] ASoc: mxs: add mxs-pcm driver > > On Tue, Jul 12, 2011 at 11:04:36PM +0800, Dong Aisheng wrote: > > > + if (dai->driver->capture.channels_min) { > > + ret = mxs_pcm_preallocate_dma_buffer(pcm, > > + SNDRV_PCM_STREAM_CAPTURE); > > + if (ret) > > + goto out; > > + } > > For robustness replace the channels_min check with a check for the > relevant substream being present (see pxa2xx-pcm.c for a recent example). Is this change ok? diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c index 3e3a8c8..a385ba9 100644 --- a/sound/soc/mxs/mxs-pcm.c +++ b/sound/soc/mxs/mxs-pcm.c @@ -288,14 +288,14 @@ static int mxs_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, card->dev->dma_mask = &mxs_pcm_dmamask; if (!card->dev->coherent_dma_mask) card->dev->coherent_dma_mask = DMA_BIT_MASK(32); - if (dai->driver->playback.channels_min) { + if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { ret = mxs_pcm_preallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_PLAYBACK); if (ret) goto out; } - if (dai->driver->capture.channels_min) { + if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) { ret = mxs_pcm_preallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_CAPTURE); if (ret) Regards Dong Aisheng
next prev parent reply other threads:[~2011-07-13 6:29 UTC|newest] Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-07-12 15:04 [PATCH V2 00/10] Dong Aisheng 2011-07-12 15:04 ` Dong Aisheng 2011-07-12 15:04 ` [PATCH V2 01/10] ASoc: mxs: add mxs-pcm driver Dong Aisheng 2011-07-12 15:04 ` Dong Aisheng 2011-07-12 23:27 ` Mark Brown 2011-07-12 23:27 ` Mark Brown 2011-07-13 3:20 ` Dong Aisheng-B29396 2011-07-13 3:20 ` Dong Aisheng-B29396 2011-07-13 6:29 ` Dong Aisheng-B29396 [this message] 2011-07-13 6:29 ` Dong Aisheng-B29396 2011-07-13 7:44 ` Russell King - ARM Linux 2011-07-13 7:44 ` Russell King - ARM Linux 2011-07-13 8:17 ` Dong Aisheng-B29396 2011-07-13 8:17 ` Dong Aisheng-B29396 2011-07-14 12:31 ` Wolfram Sang 2011-07-14 12:31 ` Wolfram Sang 2011-07-14 16:15 ` Dong Aisheng 2011-07-14 16:15 ` [alsa-devel] " Dong Aisheng 2011-07-15 6:30 ` Dong Aisheng-B29396 2011-07-15 6:30 ` [alsa-devel] " Dong Aisheng-B29396 2011-07-12 15:04 ` [PATCH V2 02/10] ASoc: mxs: add mxs-saif driver Dong Aisheng 2011-07-12 15:04 ` Dong Aisheng 2011-07-13 1:03 ` Mark Brown 2011-07-13 1:03 ` Mark Brown 2011-07-13 8:14 ` [alsa-devel] " Dong Aisheng-B29396 2011-07-13 8:14 ` Dong Aisheng-B29396 2011-07-14 3:06 ` Mark Brown 2011-07-14 3:06 ` Mark Brown 2011-07-14 4:34 ` Dong Aisheng-B29396 2011-07-14 4:34 ` Dong Aisheng-B29396 2011-07-14 10:39 ` Dong Aisheng-B29396 2011-07-14 10:39 ` [alsa-devel] " Dong Aisheng-B29396 2011-07-14 11:05 ` Mark Brown 2011-07-14 11:05 ` [alsa-devel] " Mark Brown 2011-07-14 16:06 ` Dong Aisheng 2011-07-14 16:06 ` [alsa-devel] " Dong Aisheng 2011-07-12 15:04 ` [PATCH V2 03/10] ASoc: mxs: add mxs-sgtl5000 machine driver Dong Aisheng 2011-07-12 15:04 ` Dong Aisheng 2011-07-13 11:57 ` Wolfram Sang 2011-07-13 11:57 ` Wolfram Sang 2011-07-13 12:19 ` Dong Aisheng-B29396 2011-07-13 12:19 ` Dong Aisheng-B29396 2011-07-13 13:40 ` Dong Aisheng-B29396 2011-07-13 13:40 ` Dong Aisheng-B29396 2011-07-13 14:00 ` Wolfram Sang 2011-07-13 14:00 ` Wolfram Sang 2011-07-13 14:13 ` Dong Aisheng-B29396 2011-07-13 14:13 ` Dong Aisheng-B29396 2011-07-13 14:22 ` Dong Aisheng-B29396 2011-07-13 14:22 ` Dong Aisheng-B29396 2011-07-13 15:01 ` Wolfram Sang 2011-07-13 15:01 ` Wolfram Sang 2011-07-13 15:16 ` Dong Aisheng 2011-07-13 15:16 ` Dong Aisheng 2011-07-13 12:46 ` Mark Brown 2011-07-13 12:46 ` Mark Brown 2011-07-13 12:59 ` Wolfram Sang 2011-07-13 12:59 ` Wolfram Sang 2011-07-13 15:58 ` Wolfram Sang 2011-07-13 15:58 ` Wolfram Sang 2011-07-14 3:04 ` [alsa-devel] " Dong Aisheng-B29396 2011-07-14 3:04 ` Dong Aisheng-B29396 [not found] ` <1310483085-31442-4-git-send-email-b29396-KZfg59tc24xl57MIdRCFDg@public.gmane.org> 2011-07-15 15:11 ` Shawn Guo 2011-07-15 15:11 ` Shawn Guo 2011-07-15 15:17 ` Mark Brown 2011-07-15 15:17 ` Mark Brown 2011-07-12 15:04 ` [PATCH V2 04/10] ASoc: mxs: add asoc configuration files Dong Aisheng 2011-07-12 15:04 ` Dong Aisheng 2011-07-13 9:08 ` Wolfram Sang 2011-07-13 9:08 ` Wolfram Sang 2011-07-13 11:13 ` Dong Aisheng 2011-07-13 11:13 ` [alsa-devel] " Dong Aisheng 2011-07-12 15:04 ` [PATCH V2 05/10] ARM: mxs: add saif clock Dong Aisheng 2011-07-12 15:04 ` Dong Aisheng 2011-07-12 15:04 ` [PATCH V2 06/10] ARM: mxs: add saif device Dong Aisheng 2011-07-12 15:04 ` Dong Aisheng 2011-07-15 13:32 ` Wolfram Sang 2011-07-15 13:32 ` Wolfram Sang 2011-07-15 15:02 ` Dong Aisheng 2011-07-15 15:02 ` [alsa-devel] " Dong Aisheng 2011-07-15 15:34 ` Wolfram Sang 2011-07-15 15:34 ` [alsa-devel] " Wolfram Sang 2011-07-15 17:22 ` Dong Aisheng 2011-07-15 17:22 ` [alsa-devel] " Dong Aisheng 2011-07-12 18:22 ` [PATCH V2 00/10] Wolfram Sang 2011-07-12 18:22 ` Wolfram Sang 2011-07-13 3:02 ` [PATCH V2 00/10] ARM: mxs: add audio support Dong Aisheng-B29396 2011-07-13 3:02 ` Dong Aisheng-B29396 2011-07-13 3:36 ` [PATCH V2 07/10] ARM: mxs: add sgtl5000 i2c device Dong Aisheng 2011-07-13 3:36 ` Dong Aisheng 2011-07-13 9:13 ` Wolfram Sang 2011-07-13 9:13 ` Wolfram Sang 2011-07-13 9:56 ` Wolfram Sang 2011-07-13 9:56 ` Wolfram Sang 2011-07-13 11:09 ` Dong Aisheng-B29396 2011-07-13 11:09 ` Dong Aisheng-B29396 2011-07-13 3:39 ` [PATCH V2 08/10] ARM: mxs: add mxs-sgtl5000 device Dong Aisheng 2011-07-13 3:39 ` Dong Aisheng 2011-07-13 3:40 ` [PATCH V2 09/10] ARM: mxs: correct the using of frac div for saif Dong Aisheng 2011-07-13 3:40 ` Dong Aisheng 2011-07-13 3:40 ` [PATCH V2 10/10] ARM: mxs-dma: include <linux/dmaengine.h> Dong Aisheng 2011-07-13 3:40 ` Dong Aisheng 2011-07-14 14:17 ` Wolfram Sang 2011-07-14 14:17 ` Wolfram Sang
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=65EE16ACC360FA4D99C96DC085B3F7721CD7EC@039-SN1MPN1-002.039d.mgd.msft.net \ --to=b29396@freescale.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@opensource.wolfsonmicro.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=lrg@ti.com \ --cc=s.hauer@pengutronix.de \ --cc=u.kleine-koenig@pengutronix.de \ /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.