Merge branch 'for-2.6.36' into for-2.6.37

7eba6c05 · Mark Brown · e4b6b74f · 708fafb3 · 7eba6c05
Commit 7eba6c05 authored Aug 27, 2010 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/soc-core.c sound/soc/soc-core.c +1 -1

No files found.
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -249,7 +249,7 @@ static void soc_init_codec_debugfs(struct snd_soc_codec *codec)
 		printk(KERN_WARNING
 		       "ASoC: Failed to create codec register debugfs file\n");
-	codec->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0744,
+	codec->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0644,
 						     codec->debugfs_codec_root,
 						     &codec->pop_time);
 	if (!codec->debugfs_pop_time)