diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-11-02 09:00:37 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-11-02 09:00:37 +0100 |
| commit | bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5 (patch) | |
| tree | 1731a322d153ee18017822a8fd66295a0ec7a4e2 /sound/core/pcm.c | |
| parent | cadd16ea33a938d49aee99edd4758cc76048b399 (diff) | |
| parent | 2c8d08925272b9be383cd81f1973c6faf9fbf53a (diff) | |
| download | linux-bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5.tar.gz linux-bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/core/pcm.c')
| -rw-r--r-- | sound/core/pcm.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 02bd96954dc4..308c9ecf73db 100644 --- a/sound/core/pcm.c +++ b/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); |