From ddb16e5ac6f62f274903894b263700e5c4270103 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 8 Feb 2012 18:34:19 +0000 Subject: [PATCH] --- yaml --- r: 293315 b: refs/heads/master c: a5d3a21a9a8c5a2b8332768a3ce9636b630ef664 h: refs/heads/master i: 293313: 03c563a560def62aaceaf739aa335dd062db92ce 293311: 107d1582895297d9fdae58b300efe0e5128e45e7 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/twl6040.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4d17cfc8a492..daf093311219 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5124e69e2b31f4ded7ed9ac47b18804b7847f677 +refs/heads/master: a5d3a21a9a8c5a2b8332768a3ce9636b630ef664 diff --git a/trunk/sound/soc/codecs/twl6040.c b/trunk/sound/soc/codecs/twl6040.c index 284dd2e99971..836eb14f7b85 100644 --- a/trunk/sound/soc/codecs/twl6040.c +++ b/trunk/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),