git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
sound
/
core
/
pcm_memory.c
diff --git
a/sound/core/pcm_memory.c
b/sound/core/pcm_memory.c
index
428f8c1
..
a0119ae
100644
(file)
--- a/
sound/core/pcm_memory.c
+++ b/
sound/core/pcm_memory.c
@@
-100,10
+100,8
@@
static void snd_pcm_lib_preallocate_dma_free(struct snd_pcm_substream *substream
int snd_pcm_lib_preallocate_free(struct snd_pcm_substream *substream)
{
snd_pcm_lib_preallocate_dma_free(substream);
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);
substream->proc_prealloc_entry = NULL;
snd_info_unregister(substream->proc_prealloc_entry);
substream->proc_prealloc_entry = NULL;
-#endif
return 0;
}
return 0;
}
@@
-126,7
+124,7
@@
int snd_pcm_lib_preallocate_free_for_all(struct snd_pcm *pcm)
return 0;
}
return 0;
}
-#ifdef CONFIG_
SND_VERBOSE_PROC
FS
+#ifdef CONFIG_
PROC_
FS
/*
* read callback for prealloc proc file
*
/*
* read callback for prealloc proc file
*
@@
-205,9
+203,9
@@
static inline void preallocate_info_init(struct snd_pcm_substream *substream)
substream->proc_prealloc_entry = entry;
}
substream->proc_prealloc_entry = entry;
}
-#else /* !CONFIG_
SND_VERBOSE_PROC
FS */
+#else /* !CONFIG_
PROC_
FS */
#define preallocate_info_init(s)
#define preallocate_info_init(s)
-#endif
/* CONFIG_SND_VERBOSE_PROCFS */
+#endif
/*
* pre-allocate the buffer and create a proc file for the substream
/*
* pre-allocate the buffer and create a proc file for the substream