| commit | 7eba6c05c5075f885f0b26244e1fdac76355f562 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Fri Aug 27 20:10:22 2010 +0100 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Fri Aug 27 20:10:22 2010 +0100 |
| tree | e1939be6de4ebb9b866077c605006ef58b5e49f1 | |
| parent | e4b6b74ffd32d114227a5dcfe814e2cecd80554b [diff] | |
| parent | 708fafb3c54039caa5dadc8e9d2dfd999f88f190 [diff] |
Merge branch 'for-2.6.36' into for-2.6.37
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 65352c7..42542e0 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c
@@ -249,7 +249,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)