git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
[pandora-kernel.git]
/
sound
/
core
/
pcm_memory.c
diff --git
a/sound/core/pcm_memory.c
b/sound/core/pcm_memory.c
index
067d205
..
be030cb
100644
(file)
--- a/
sound/core/pcm_memory.c
+++ b/
sound/core/pcm_memory.c
@@
-101,7
+101,7
@@
int snd_pcm_lib_preallocate_free(struct snd_pcm_substream *substream)
{
snd_pcm_lib_preallocate_dma_free(substream);
#ifdef CONFIG_SND_VERBOSE_PROCFS
- snd_info_
unregister
(substream->proc_prealloc_entry);
+ snd_info_
free_entry
(substream->proc_prealloc_entry);
substream->proc_prealloc_entry = NULL;
#endif
return 0;