vserver 1.9.5.x5

[linux-2.6.git] / sound / isa / gus / gus_mem.c

diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c
index b1f6487..bfc2b91 100644 (file)
--- a/sound/isa/gus/gus_mem.c
+++ b/sound/isa/gus/gus_mem.c
@@ -59,7 +59,7 @@ snd_gf1_mem_block_t *snd_gf1_mem_xalloc(snd_gf1_mem_t * alloc,
                        else
                                nblock->prev->next = nblock;
                        up(&alloc->memory_mutex);
-                       return 0;
+                       return NULL;
                }
                pblock = pblock->next;
        }
@@ -100,8 +100,7 @@ int snd_gf1_mem_xfree(snd_gf1_mem_t * alloc, snd_gf1_mem_block_t * block)
                if (block->prev)
                        block->prev->next = block->next;
        }
-       if (block->name)
-               kfree(block->name);
+       kfree(block->name);
        kfree(block);
        return 0;
 }
@@ -297,7 +296,7 @@ static void snd_gf1_mem_info_read(snd_info_entry_t *entry,
        unsigned int total, used;
        int i;
 
-       gus = snd_magic_cast(snd_gus_card_t, entry->private_data, return);
+       gus = entry->private_data;
        alloc = &gus->gf1.mem_alloc;
        down(&alloc->memory_mutex);
        snd_iprintf(buffer, "8-bit banks       : \n    ");