---

yaml --- r: 270880 b: refs/heads/master c: 35dec69 h: refs/heads/master v: v3
git-mirror · Oct 14, 2011 · 9b143e7 · 9b143e7
1 parent 45bceef
commit 9b143e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d69c5c5de32c355667c105a5fac85c8043128e6
+refs/heads/master: 35dec697579459983e3471b622f57c18f6e9fd0a
diff --git a/trunk/sound/soc/codecs/twl6040.c b/trunk/sound/soc/codecs/twl6040.c
@@ -1504,6 +1504,7 @@ 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;