diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-28 15:44:15 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-28 15:44:15 -0400 |
| commit | 9dde3f92a7342e690f6f4a7ee8746d9b43d4c723 (patch) | |
| tree | ca60b194cc75f6f5a06bbe60fa60bf67bac9da84 /sound | |
| parent | 6a366725029c74827ca8d74361e02bca1804102e (diff) | |
| parent | 708fafb3c54039caa5dadc8e9d2dfd999f88f190 (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 844ae8221a3a..acc91daa1c55 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) | |||
| 251 | printk(KERN_WARNING | 251 | printk(KERN_WARNING |
| 252 | "ASoC: Failed to create codec register debugfs file\n"); | 252 | "ASoC: Failed to create codec register debugfs file\n"); |
| 253 | 253 | ||
| 254 | codec->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0744, | 254 | codec->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0644, |
| 255 | codec->debugfs_codec_root, | 255 | codec->debugfs_codec_root, |
| 256 | &codec->pop_time); | 256 | &codec->pop_time); |
| 257 | if (!codec->debugfs_pop_time) | 257 | if (!codec->debugfs_pop_time) |