aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesper Juhl <jesper.juhl@gmail.com>2006-03-28 01:56:49 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-28 09:16:08 -0800
commit07e0e93d9a3cdbe3cad450e0d0a2937585dffc55 (patch)
treeea4ab1d1b81ffb43eec99b949a0be01e20abe816
parent[PATCH] vfree NULL check fixup for sb_card (diff)
downloadlinux-dev-07e0e93d9a3cdbe3cad450e0d0a2937585dffc55.tar.xz
linux-dev-07e0e93d9a3cdbe3cad450e0d0a2937585dffc55.zip
[PATCH] maestro3 vfree NULL check fixup
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>
-rw-r--r--sound/oss/maestro3.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/oss/maestro3.c b/sound/oss/maestro3.c
index 66044aff2586..4a5e4237a110 100644
--- a/sound/oss/maestro3.c
+++ b/sound/oss/maestro3.c
@@ -2582,15 +2582,9 @@ static int alloc_dsp_suspendmem(struct m3_card *card)
return 0;
}
-static void free_dsp_suspendmem(struct m3_card *card)
-{
- if(card->suspend_mem)
- vfree(card->suspend_mem);
-}
#else
#define alloc_dsp_suspendmem(args...) 0
-#define free_dsp_suspendmem(args...)
#endif
/*
@@ -2717,7 +2711,7 @@ out:
if(ret) {
if(card->iobase)
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) {
unregister_sound_mixer(card->ac97->dev_mixer);
kfree(card->ac97);
@@ -2760,7 +2754,7 @@ static void m3_remove(struct pci_dev *pci_dev)
}
release_region(card->iobase, 256);
- free_dsp_suspendmem(card);
+ vfree(card->suspend_mem);
kfree(card);
}
devs = NULL;