Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

sound: sound/oss/msnd_pinnacle.c: add vfrees

Browse source 
At the point of this error-handling code, HAVE_DSPCODEH may be undefined,
so free INITCODE and PERMCODE as done elsewhere.  A jump and label are
introduced to avoid code duplication.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Julia Lawall 2012-04-09 10:16:32 +02:00 committed by Takashi Iwai
parent c38f62b08d
commit 156d14da4c
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sound/oss/msnd_pinnacle.c
View file

@ -1294,6 +1294,8 @@ static int __init calibrate_adc(WORD srate)
static int upload_dsp_code(void) static int upload_dsp_code(void)
{ {
int ret = 0;
msnd_outb(HPBLKSEL_0, dev.io + HP_BLKS); msnd_outb(HPBLKSEL_0, dev.io + HP_BLKS);
#ifndef HAVE_DSPCODEH #ifndef HAVE_DSPCODEH
INITCODESIZE = mod_firmware_load(INITCODEFILE, &INITCODE); INITCODESIZE = mod_firmware_load(INITCODEFILE, &INITCODE);
@ -1312,7 +1314,8 @@ static int upload_dsp_code(void)
memcpy_toio(dev.base, PERMCODE, PERMCODESIZE); memcpy_toio(dev.base, PERMCODE, PERMCODESIZE);
if (msnd_upload_host(&dev, INITCODE, INITCODESIZE) < 0) { if (msnd_upload_host(&dev, INITCODE, INITCODESIZE) < 0) {
printk(KERN_WARNING LOGNAME ": Error uploading to DSP\n"); printk(KERN_WARNING LOGNAME ": Error uploading to DSP\n");
return -ENODEV; ret = -ENODEV;
goto out;
} }
#ifdef HAVE_DSPCODEH #ifdef HAVE_DSPCODEH
printk(KERN_INFO LOGNAME ": DSP firmware uploaded (resident)\n"); printk(KERN_INFO LOGNAME ": DSP firmware uploaded (resident)\n");
@ -1320,12 +1323,13 @@ static int upload_dsp_code(void)
printk(KERN_INFO LOGNAME ": DSP firmware uploaded\n"); printk(KERN_INFO LOGNAME ": DSP firmware uploaded\n");
#endif #endif
out:
#ifndef HAVE_DSPCODEH #ifndef HAVE_DSPCODEH
vfree(INITCODE); vfree(INITCODE);
vfree(PERMCODE); vfree(PERMCODE);
#endif #endif
return 0; return ret;
} }
#ifdef MSND_CLASSIC #ifdef MSND_CLASSIC