diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-08 13:34:19 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-09 05:43:10 -0500 |
commit | a5d3a21a9a8c5a2b8332768a3ce9636b630ef664 (patch) | |
tree | 4e3ba95772374936b04b848e88d42e32cddea0fc /sound/soc/codecs/twl6040.c | |
parent | 5124e69e2b31f4ded7ed9ac47b18804b7847f677 (diff) |
ASoC: twl6040: Move ignore_pmdown_time to driver struct
It's set unconditionally.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Diffstat (limited to 'sound/soc/codecs/twl6040.c')
-rw-r--r-- | sound/soc/codecs/twl6040.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index 284dd2e99971..836eb14f7b85 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c | |||
@@ -1540,7 +1540,6 @@ static int twl6040_probe(struct snd_soc_codec *codec) | |||
1540 | 1540 | ||
1541 | priv->codec = codec; | 1541 | priv->codec = codec; |
1542 | codec->control_data = dev_get_drvdata(codec->dev->parent); | 1542 | codec->control_data = dev_get_drvdata(codec->dev->parent); |
1543 | codec->ignore_pmdown_time = 1; | ||
1544 | 1543 | ||
1545 | if (pdata && pdata->hs_left_step && pdata->hs_right_step) { | 1544 | if (pdata && pdata->hs_left_step && pdata->hs_right_step) { |
1546 | priv->hs_left_step = pdata->hs_left_step; | 1545 | priv->hs_left_step = pdata->hs_left_step; |
@@ -1626,6 +1625,7 @@ static struct snd_soc_codec_driver soc_codec_dev_twl6040 = { | |||
1626 | .reg_cache_size = ARRAY_SIZE(twl6040_reg), | 1625 | .reg_cache_size = ARRAY_SIZE(twl6040_reg), |
1627 | .reg_word_size = sizeof(u8), | 1626 | .reg_word_size = sizeof(u8), |
1628 | .reg_cache_default = twl6040_reg, | 1627 | .reg_cache_default = twl6040_reg, |
1628 | .ignore_pmdown_time = true, | ||
1629 | 1629 | ||
1630 | .controls = twl6040_snd_controls, | 1630 | .controls = twl6040_snd_controls, |
1631 | .num_controls = ARRAY_SIZE(twl6040_snd_controls), | 1631 | .num_controls = ARRAY_SIZE(twl6040_snd_controls), |