kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] maestro3 vfree NULL check fixup

Browse source 
vfree() checks for NULL, no need to do it explicitly.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Acked-by: Zach Brown <zab@zabbo.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jesper Juhl 2006-03-28 01:56:49 -08:00 committed by Linus Torvalds
parent 457d3d432b
commit 07e0e93d9a
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sound/oss/maestro3.c
View file

@ -2582,15 +2582,9 @@ static int alloc_dsp_suspendmem(struct m3_card *card)
return 0; return 0;
} }
static void free_dsp_suspendmem(struct m3_card *card)
{
if(card->suspend_mem)
vfree(card->suspend_mem);
}
#else #else
#define alloc_dsp_suspendmem(args...) 0 #define alloc_dsp_suspendmem(args...) 0
#define free_dsp_suspendmem(args...)
#endif #endif
/* /*
@ -2717,7 +2711,7 @@ out:
if(ret) { if(ret) {
if(card->iobase) if(card->iobase)
release_region(pci_resource_start(pci_dev, 0), pci_resource_len(pci_dev, 0)); release_region(pci_resource_start(pci_dev, 0), pci_resource_len(pci_dev, 0));
free_dsp_suspendmem(card); vfree(card->suspend_mem);
if(card->ac97) { if(card->ac97) {
unregister_sound_mixer(card->ac97->dev_mixer); unregister_sound_mixer(card->ac97->dev_mixer);
kfree(card->ac97); kfree(card->ac97);
@ -2760,7 +2754,7 @@ static void m3_remove(struct pci_dev *pci_dev)
} }
release_region(card->iobase, 256); release_region(card->iobase, 256);
free_dsp_suspendmem(card); vfree(card->suspend_mem);
kfree(card); kfree(card);
} }
devs = NULL; devs = NULL;