diff options
| author |   Jerome Brunet <jbrunet@baylibre.com> | 2018-04-27 13:31:51 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2018-05-02 05:56:36 +0900 |
| commit | 40c57963789d451c26269e3bc9f9e803060fd9af (patch) | |
| tree | 41b55350be7dd7d2d87bb6faa23c947f56c7a87d /include/sound/soc-dai.h | |
| parent | ASoC: cirrus: i2s: Fix {TX|RX}LinCtrlData setup (diff) | |
| download | linux-dev-40c57963789d451c26269e3bc9f9e803060fd9af.tar.xz linux-dev-40c57963789d451c26269e3bc9f9e803060fd9af.zip | |
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: f0fba2ad1b6b ("ASoC: multi-component - ASoC Multi-Component Support")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/sound/soc-dai.h')
| -rw-r--r-- | include/sound/soc-dai.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 8ad11669e4d8..35ebb0be5114 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -294,8 +294,8 @@ struct snd_soc_dai { struct snd_soc_dai_driver *driver; /* DAI runtime info */ - unsigned int capture_active:1; /* stream is in use */ - unsigned int playback_active:1; /* stream is in use */ + unsigned int capture_active; /* stream usage count */ + unsigned int playback_active; /* stream usage count */ unsigned int probed:1; unsigned int active; |