aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-08-28 21:44:15 +0200
committerTakashi Iwai <tiwai@suse.de>2010-08-28 21:44:15 +0200
commit9dde3f92a7342e690f6f4a7ee8746d9b43d4c723 (patch)
treeca60b194cc75f6f5a06bbe60fa60bf67bac9da84 /sound
parent6a366725029c74827ca8d74361e02bca1804102e (diff)
parent708fafb3c54039caa5dadc8e9d2dfd999f88f190 (diff)
downloadlinux-linaro-android-9dde3f92a7342e690f6f4a7ee8746d9b43d4c723.tar.gz
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 844ae8221a3..acc91daa1c5 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -251,7 +251,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)