diff options
| author | Liam Girdwood <lrg@ti.com> | 2012-03-07 10:38:26 +0000 |
|---|---|---|
| committer | Mrutyunjay Sawant <msawant@nvidia.com> | 2012-09-04 05:16:10 -0700 |
| commit | bad016421fc94642de2ad70a78d2917549d81541 (patch) | |
| tree | a1519985b73c334f591a7e0393eda1fc35d76f01 /sound/soc/soc-core.c | |
| parent | 616ade39df296b2c60d8ce74c719bc560f78f598 (diff) | |
ASoC: dapm: Use DAPM mutex for DAPM ops instead of codec mutex
It has now become necessary to use a DAPM mutex instead of the codec
mutex to lock the DAPM operations. This is due to the recent multi
component support and forth coming Dynamic PCM updates.
Currently we lock DAPM operations with the codec mutex of the calling
RTD context. However, DAPM operations can span the whole card context
and all components.
This patch updates the DAPM operations that use the codec mutex to
now use the DAPM mutex PCM subclass for all DAPM ops.
We also add a mutex subclass for DAPM init and PCM operations.
Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
(cherry picked from commit a73fb2df01866b772a48fab93401fe3edbe0b38d)
Updated call sequences
Bug 1039523
Change-Id: If079bbe5032971251d6b5426c752cbcc6ad6bcf5
Signed-off-by: Sang-Hun Lee <sanlee@nvidia.com>
Reviewed-on: http://git-master/r/128937
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index ef69f5a02709..db2e0f0c00e8 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2897,6 +2897,7 @@ int snd_soc_register_card(struct snd_soc_card *card) INIT_LIST_HEAD(&card->list); card->instantiated = 0; mutex_init(&card->mutex); + mutex_init(&card->dapm_mutex); mutex_lock(&client_mutex); list_add(&card->list, &card_list); |