linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / sound / oss / awe_wave.c

diff --git a/sound/oss/awe_wave.c b/sound/oss/awe_wave.c
index d1a0eb2..b3ea719 100644 (file)
--- a/sound/oss/awe_wave.c
+++ b/sound/oss/awe_wave.c
@@ -2944,7 +2944,7 @@ alloc_new_info(void)
 {
        awe_voice_list *newlist;
        
-       newlist = kmalloc(sizeof(*newlist), GFP_KERNEL);
+       newlist = (awe_voice_list *)kmalloc(sizeof(*newlist), GFP_KERNEL);
        if (newlist == NULL) {
                printk(KERN_ERR "AWE32: can't alloc info table\n");
                return NULL;
@@ -3547,10 +3547,8 @@ awe_load_guspatch(const char __user *addr, int offs, int size, int pmgr_flag)
        smp->checksum_flag = 0;
        smp->checksum = 0;
 
-       if ((rc = awe_write_wave_data(addr, sizeof_patch, smprec, -1)) < 0) {
-               kfree(vrec);
+       if ((rc = awe_write_wave_data(addr, sizeof_patch, smprec, -1)) < 0)
                return rc;
-       }
        sf->mem_ptr += rc;
        add_sf_sample(sf, smprec);