| commit | 9dde3f92a7342e690f6f4a7ee8746d9b43d4c723 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Sat Aug 28 21:44:15 2010 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Sat Aug 28 21:44:15 2010 +0200 |
| tree | ca60b194cc75f6f5a06bbe60fa60bf67bac9da84 | |
| parent | 6a366725029c74827ca8d74361e02bca1804102e [diff] | |
| parent | 708fafb3c54039caa5dadc8e9d2dfd999f88f190 [diff] |
Merge branch 'fix/asoc' into for-linus
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 844ae82..acc91da 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c
@@ -251,7 +251,7 @@ 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)