From: Markus Pargmann <mpa@pengutronix.de>
To: "Lothar Waßmann" <LW@KARO-electronics.de>
Cc: linux-arm-kernel@lists.infradead.org,
alsa-devel@alsa-project.org, Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
kernel@pengutronix.de
Subject: Re: [PATCH 2/3] ASoC: mxs-saif: Store saif state
Date: Fri, 11 Oct 2013 12:46:10 +0200 [thread overview]
Message-ID: <20131011104610.GI19005@pengutronix.de> (raw)
In-Reply-To: <20131011123146.73ff30ce@ipc1.ka-ro>
Hi,
On Fri, Oct 11, 2013 at 12:31:46PM +0200, Lothar Waßmann wrote:
> Hi,
>
> > Trigger commands may be passed multiple times. To avoid errors with
> > clk_enable/disable, store the saif state and return if saif is already
> > running/stopped.
> >
> > Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> > ---
> > sound/soc/mxs/mxs-saif.c | 8 ++++++++
> > sound/soc/mxs/mxs-saif.h | 5 +++++
> > 2 files changed, 13 insertions(+)
> >
> > diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
> > index b56b8a0..c8ead01 100644
> > --- a/sound/soc/mxs/mxs-saif.c
> > +++ b/sound/soc/mxs/mxs-saif.c
> > @@ -503,6 +503,9 @@ static int mxs_saif_trigger(struct snd_pcm_substream *substream, int cmd,
> > case SNDRV_PCM_TRIGGER_START:
> > case SNDRV_PCM_TRIGGER_RESUME:
> > case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
> > + if (saif->state == MXS_SAIF_STATE_RUNNING)
> > + return 0;
> > +
> > dev_dbg(cpu_dai->dev, "start\n");
> >
> > clk_enable(master_saif->clk);
> > @@ -543,6 +546,7 @@ static int mxs_saif_trigger(struct snd_pcm_substream *substream, int cmd,
> > }
> >
> > master_saif->ongoing = 1;
> > + saif->state = MXS_SAIF_STATE_RUNNING;
> >
> It seems to me that you could use the already existing variable
> 'ongoing' that already reflects the state like you need it.
'ongoing' can only be used if master_saif == saif. Otherwise this
variable does not reflect the state of the saif. For example there could
be parallel audio playback and recording, setting the variable only on
the master_saif->ongoing but not for the second saif.
Regards,
Markus Pargmann
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2013-10-11 10:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-11 10:11 [PATCH 0/3] ASoC: mxs-saif error handling Markus Pargmann
2013-10-11 10:11 ` [PATCH 1/3] ASoC: snd_soc_dai_ops trigger function description Markus Pargmann
2013-10-11 10:11 ` [PATCH 2/3] ASoC: mxs-saif: Store saif state Markus Pargmann
2013-10-11 10:31 ` Lothar Waßmann
2013-10-11 10:46 ` Markus Pargmann [this message]
2013-10-11 10:11 ` [PATCH 3/3] ASoC: mxs-saif: Handle errors in trigger function Markus Pargmann
2013-10-14 17:02 ` [PATCH 0/3] ASoC: mxs-saif error handling 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=20131011104610.GI19005@pengutronix.de \
--to=mpa@pengutronix.de \
--cc=LW@KARO-electronics.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=kernel@pengutronix.de \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).