diff options
| author | Mark Brown <broonie@kernel.org> | 2018-01-26 15:26:45 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-26 15:26:45 +0000 |
| commit | f63968e79a390838dba2a27457b552dbf9587e98 (patch) | |
| tree | 86b179d5f27ed83d26d2cd9ece1de28d37b361d2 | |
| parent | 70fff7438b049cdd66f26a50d016baffdc719095 (diff) | |
| parent | 72c3818411e5418834472e3edadcf04cfacb1274 (diff) | |
Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next
| -rw-r--r-- | include/sound/soc.h | 2 | ||||
| -rw-r--r-- | sound/soc/soc-pcm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 6e865c2bcffe4..7d6abbb2823af 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -839,7 +839,7 @@ struct snd_soc_component_driver { /* bits */ unsigned int idle_bias_on:1; unsigned int suspend_bias_off:1; - unsigned int pmdown_time:1; /* care pmdown_time at stop */ + unsigned int use_pmdown_time:1; /* care pmdown_time at stop */ unsigned int endianness:1; unsigned int non_legacy_dai_naming:1; }; diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 998800cc44ef9..084125463d101 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -144,7 +144,7 @@ bool snd_soc_runtime_ignore_pmdown_time(struct snd_soc_pcm_runtime *rtd) for_each_rtdcom(rtd, rtdcom) { component = rtdcom->component; - ignore &= !component->driver->pmdown_time; + ignore &= !component->driver->use_pmdown_time; } /* this will be removed */ |