Commit 40c57963 authored by Jerome Brunet's avatar Jerome Brunet Committed by Mark Brown

ASoC: dai playback and capture active may be greater than 1

At the moment playback_active and capture_active are using only 1 bit so
the maximum active count is 1.

However, snd_soc_runtime_activate() may be called several time on the
same dai. This happens when a dai is part of several dai_links. It is
often the case for "snd-soc-dummy-dai".

This is a problem if snd_soc_runtime_activate() is called an even number
of times on a dai. In this case the active count overflow back to 0. As
consequence, ASoC functions, such as soc_dpcm_runtime_update(), won't run
correctly.

Storing these usage counts on plain 'unsigned int' solves the problem.

Fixes: f0fba2ad ("ASoC: multi-component - ASoC Multi-Component Support")
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5d302ed3
...@@ -294,8 +294,8 @@ struct snd_soc_dai { ...@@ -294,8 +294,8 @@ struct snd_soc_dai {
struct snd_soc_dai_driver *driver; struct snd_soc_dai_driver *driver;
/* DAI runtime info */ /* DAI runtime info */
unsigned int capture_active:1; /* stream is in use */ unsigned int capture_active; /* stream usage count */
unsigned int playback_active:1; /* stream is in use */ unsigned int playback_active; /* stream usage count */
unsigned int probed:1; unsigned int probed:1;
unsigned int active; unsigned int active;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment