From: Mark Brown <broonie@kernel.org>
To: Moise Gergaud <moise.gergaud@st.com>,
Arnaud Pouliquen <arnaud.pouliquen@st.com>,
Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org
Subject: Applied "ASoC: sti: set player private data" to the asoc tree
Date: Thu, 19 Nov 2015 19:56:41 +0000 [thread overview]
Message-ID: <E1ZzVJx-0006T4-Rn@debutante> (raw)
In-Reply-To: <1447941250-344-4-git-send-email-moise.gergaud@st.com>
The patch
ASoC: sti: set player private data
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 36a65e2072625556191c6c616d65ed4f67f4f0d0 Mon Sep 17 00:00:00 2001
From: Moise Gergaud <moise.gergaud@st.com>
Date: Thu, 19 Nov 2015 14:54:09 +0100
Subject: [PATCH] ASoC: sti: set player private data
Set substream player private data.
substream player private data is used in uni_player_irq_handler to lock,
stop & unlock the stream when interrupt indicates underflow/overflow.
If not set, then segmentation fault occurs.
Signed-off-by: Moise Gergaud <moise.gergaud@st.com>
Acked-by: Arnaud Pouliquen <arnaud.pouliquen@st.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/sti/uniperif_player.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sound/soc/sti/uniperif_player.c b/sound/soc/sti/uniperif_player.c
index 1e19a7c6b7e8..5c2bc53f0a9b 100644
--- a/sound/soc/sti/uniperif_player.c
+++ b/sound/soc/sti/uniperif_player.c
@@ -669,6 +669,7 @@ static int uni_player_startup(struct snd_pcm_substream *substream,
{
struct sti_uniperiph_data *priv = snd_soc_dai_get_drvdata(dai);
struct uniperif *player = priv->dai_data.uni;
+ player->substream = substream;
player->clk_adj = 0;
@@ -950,6 +951,8 @@ static void uni_player_shutdown(struct snd_pcm_substream *substream,
if (player->state != UNIPERIF_STATE_STOPPED)
/* Stop the player */
uni_player_stop(player);
+
+ player->substream = NULL;
}
static int uni_player_parse_dt_clk_glue(struct platform_device *pdev,
--
2.6.2
next prev parent reply other threads:[~2015-11-19 19:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-19 13:54 [PATCH 0/4] ASoC sti: corrections Moise Gergaud
2015-11-19 13:54 ` [PATCH 1/4] ASoC: sti: remove wrong error message Moise Gergaud
2015-11-19 19:56 ` Applied "ASoC: sti: remove wrong error message" to the asoc tree Mark Brown
2015-11-19 13:54 ` [PATCH 2/4] ASoC: sti: rename ST proprietary DT properties Moise Gergaud
2015-11-19 19:56 ` Applied "ASoC: sti: rename ST proprietary DT properties" to the asoc tree Mark Brown
2015-11-19 13:54 ` [PATCH 3/4] ASoC: sti: set player private data Moise Gergaud
2015-11-19 19:56 ` Mark Brown [this message]
2015-11-19 13:54 ` [PATCH 4/4] ASoC: sti: reset iec60958 settings on close Moise Gergaud
2015-11-19 17:50 ` Mark Brown
2015-11-20 9:11 ` Moise Gergaud
2015-11-21 12:45 ` Mark Brown
2015-11-23 8:50 ` Moise Gergaud
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=E1ZzVJx-0006T4-Rn@debutante \
--to=broonie@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=arnaud.pouliquen@st.com \
--cc=moise.gergaud@st.com \
/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 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.