X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=blobdiff_plain;f=sound%2Foss%2Fawe_wave.c;fp=sound%2Foss%2Fawe_wave.c;h=b3ea719d33db0b737a6fb64c5d7d311b14014f99;hp=d1a0eb294d6f64c2b45aac340fb05ae0ba913429;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c diff --git a/sound/oss/awe_wave.c b/sound/oss/awe_wave.c index d1a0eb294..b3ea719d3 100644 --- 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);