From a5d3a21a9a8c5a2b8332768a3ce9636b630ef664 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 8 Feb 2012 18:34:19 +0000 Subject: ASoC: twl6040: Move ignore_pmdown_time to driver struct It's set unconditionally. Signed-off-by: Mark Brown Acked-by: Liam Girdwood Acked-by: Peter Ujfalusi --- sound/soc/codecs/twl6040.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sound/soc/codecs/twl6040.c') 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) 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), -- cgit v1.2.3