diff options
| author | Mark Brown <broonie@kernel.org> | 2019-04-26 11:02:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-04-26 11:02:03 +0100 |
| commit | 93f38ef6a4b62fd57076d36d1345d69f8a328ad9 (patch) | |
| tree | bc7f20d968c8d1f7374927bd187d3f26f786459d /include/sound | |
| parent | 552f2d7edd38e29073f8036191320f09b534c480 (diff) | |
| parent | 780f202f2bf48aaa09282efc4dd6c39a146cc1f3 (diff) | |
| download | linux-93f38ef6a4b62fd57076d36d1345d69f8a328ad9.tar.gz linux-93f38ef6a4b62fd57076d36d1345d69f8a328ad9.tar.bz2 linux-93f38ef6a4b62fd57076d36d1345d69f8a328ad9.zip | |
Merge branch 'asoc-5.1' into asoc-5.2
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 1e2be35ed36f..482b4ea87c3c 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -802,8 +802,13 @@ struct snd_soc_component_driver { int probe_order; int remove_order; - /* signal if the module handling the component cannot be removed */ - unsigned int ignore_module_refcount:1; + /* + * signal if the module handling the component should not be removed + * if a pcm is open. Setting this would prevent the module + * refcount being incremented in probe() but allow it be incremented + * when a pcm is opened and decremented when it is closed. + */ + unsigned int module_get_upon_open:1; /* bits */ unsigned int idle_bias_on:1; |