diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2005-09-10 03:26:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 13:06:30 -0400 |
commit | f9101210e7aa72daf92722d451a2f7e3af5f781f (patch) | |
tree | 9554007e19387f2d05352ab03332be50c5b95f5b /drivers/video/vgastate.c | |
parent | 887c27f369abc458556a5ce8ab22ddd498474307 (diff) |
[PATCH] vfree and kfree cleanup in drivers/
This patch does a full cleanup of 'NULL checks before vfree', and a partial
cleanup of calls to kfree for all of drivers/ - the kfree bit is partial in
that I only did the files that also had vfree calls in them. The patch
also gets rid of some redundant (void *) casts of pointers being passed to
[vk]free, and a some tiny whitespace corrections also crept in.
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/vgastate.c')
-rw-r--r-- | drivers/video/vgastate.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/video/vgastate.c b/drivers/video/vgastate.c index 0ea62d8bc703..ca92940f3943 100644 --- a/drivers/video/vgastate.c +++ b/drivers/video/vgastate.c | |||
@@ -342,16 +342,11 @@ static void vga_cleanup(struct vgastate *state) | |||
342 | if (state->vidstate != NULL) { | 342 | if (state->vidstate != NULL) { |
343 | struct regstate *saved = (struct regstate *) state->vidstate; | 343 | struct regstate *saved = (struct regstate *) state->vidstate; |
344 | 344 | ||
345 | if (saved->vga_font0) | 345 | vfree(saved->vga_font0); |
346 | vfree(saved->vga_font0); | 346 | vfree(saved->vga_font1); |
347 | if (saved->vga_font1) | 347 | vfree(saved->vga_text); |
348 | vfree(saved->vga_font1); | 348 | vfree(saved->vga_cmap); |
349 | if (saved->vga_text) | 349 | vfree(saved->attr); |
350 | vfree(saved->vga_text); | ||
351 | if (saved->vga_cmap) | ||
352 | vfree(saved->vga_cmap); | ||
353 | if (saved->attr) | ||
354 | vfree(saved->attr); | ||
355 | kfree(saved); | 350 | kfree(saved); |
356 | state->vidstate = NULL; | 351 | state->vidstate = NULL; |
357 | } | 352 | } |