summaryrefslogtreecommitdiffstats
path: root/kernel/sound/core/pcm.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sound/core/pcm.c')
-rw-r--r--kernel/sound/core/pcm.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/kernel/sound/core/pcm.c b/kernel/sound/core/pcm.c
index dfed728d8..308c9ecf7 100644
--- a/kernel/sound/core/pcm.c
+++ b/kernel/sound/core/pcm.c
@@ -1014,9 +1014,6 @@ void snd_pcm_detach_substream(struct snd_pcm_substream *substream)
snd_free_pages((void*)runtime->control,
PAGE_ALIGN(sizeof(struct snd_pcm_mmap_control)));
kfree(runtime->hw_constraints.rules);
-#ifdef CONFIG_SND_PCM_XRUN_DEBUG
- kfree(runtime->hwptr_log);
-#endif
kfree(runtime);
substream->runtime = NULL;
put_pid(substream->pid);
@@ -1181,7 +1178,7 @@ int snd_pcm_notify(struct snd_pcm_notify *notify, int nfree)
}
EXPORT_SYMBOL(snd_pcm_notify);
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_SND_PROC_FS
/*
* Info interface
*/
@@ -1227,10 +1224,10 @@ static void snd_pcm_proc_done(void)
snd_info_free_entry(snd_pcm_proc_entry);
}
-#else /* !CONFIG_PROC_FS */
+#else /* !CONFIG_SND_PROC_FS */
#define snd_pcm_proc_init()
#define snd_pcm_proc_done()
-#endif /* CONFIG_PROC_FS */
+#endif /* CONFIG_SND_PROC_FS */
/*