diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-03-05 13:17:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-06 17:04:56 +0800 |
| commit | 3d59400fe47e7e8bfb024cd1651433bef42e268e (patch) | |
| tree | f3a0162a203e1abb9063f662b623d4972221d752 /sound/soc/soc-core.c | |
| parent | cdde4ccb14b4959bd1c96a07367bf02b746328d3 (diff) | |
| download | lwn-3d59400fe47e7e8bfb024cd1651433bef42e268e.tar.gz lwn-3d59400fe47e7e8bfb024cd1651433bef42e268e.zip | |
ASoC: Move ignore_pmdown_time from CODEC to component
In preparation for componentization move the ignore_pmdown_time field from the
snd_soc_codec struct to the snd_soc_component struct. Set it to true for non
CODEC components for now.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 6401e97b2e68..18aecd2841a8 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -4127,6 +4127,8 @@ int snd_soc_register_component(struct device *dev, return -ENOMEM; } + cmpnt->ignore_pmdown_time = true; + return __snd_soc_register_component(dev, cmpnt, cmpnt_drv, dai_drv, num_dai, true); } @@ -4325,7 +4327,7 @@ int snd_soc_register_codec(struct device *dev, codec->volatile_register = codec_drv->volatile_register; codec->readable_register = codec_drv->readable_register; codec->writable_register = codec_drv->writable_register; - codec->ignore_pmdown_time = codec_drv->ignore_pmdown_time; + codec->component.ignore_pmdown_time = codec_drv->ignore_pmdown_time; codec->dapm.bias_level = SND_SOC_BIAS_OFF; codec->dapm.dev = dev; codec->dapm.codec = codec; |