aboutsummaryrefslogtreecommitdiff
path: root/sound/core/memalloc.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-08-31 14:19:44 -0700
committerTony Luck <tony.luck@intel.com>2005-08-31 14:19:44 -0700
commit986632fd7033a0199f9548c44606377cdf1f4a80 (patch)
tree04a705d9cdcb911a86371499f0036ed1034239b4 /sound/core/memalloc.c
parenta994018a5fc987702dfb4f5d31172842ea6186dc (diff)
parent6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff)
Auto-update from upstream
Diffstat (limited to 'sound/core/memalloc.c')
-rw-r--r--sound/core/memalloc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index 02132561c3f..39a54a41552 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -512,7 +512,7 @@ static void free_all_reserved_pages(void)
* proc file interface
*/
#define SND_MEM_PROC_FILE "driver/snd-page-alloc"
-struct proc_dir_entry *snd_mem_proc;
+static struct proc_dir_entry *snd_mem_proc;
static int snd_mem_proc_read(char *page, char **start, off_t off,
int count, int *eof, void *data)
@@ -655,8 +655,7 @@ static int __init snd_mem_init(void)
static void __exit snd_mem_exit(void)
{
- if (snd_mem_proc)
- remove_proc_entry(SND_MEM_PROC_FILE, NULL);
+ remove_proc_entry(SND_MEM_PROC_FILE, NULL);
free_all_reserved_pages();
if (snd_allocated_pages > 0)
printk(KERN_ERR "snd-malloc: Memory leak? pages not freed = %li\n", snd_allocated_pages);