]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ASoC: twl6040: Move ignore_pmdown_time to driver struct
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 8 Feb 2012 18:34:19 +0000 (18:34 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Feb 2012 10:43:10 +0000 (10:43 +0000)
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>
sound/soc/codecs/twl6040.c

index 284dd2e99971931ed43505c8b27cc858db1143b7..836eb14f7b85a0598aea3aa7f1cdb9c572cf4ebf 100644 (file)
@@ -1540,7 +1540,6 @@ static int twl6040_probe(struct snd_soc_codec *codec)
 
        priv->codec = codec;
        codec->control_data = dev_get_drvdata(codec->dev->parent);
-       codec->ignore_pmdown_time = 1;
 
        if (pdata && pdata->hs_left_step && pdata->hs_right_step) {
                priv->hs_left_step = pdata->hs_left_step;
@@ -1626,6 +1625,7 @@ static struct snd_soc_codec_driver soc_codec_dev_twl6040 = {
        .reg_cache_size = ARRAY_SIZE(twl6040_reg),
        .reg_word_size = sizeof(u8),
        .reg_cache_default = twl6040_reg,
+       .ignore_pmdown_time = true,
 
        .controls = twl6040_snd_controls,
        .num_controls = ARRAY_SIZE(twl6040_snd_controls),