diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2005-11-07 04:01:31 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:54:04 -0500 |
commit | 2ea7533060e361810c21b2f5ee02151c4dfb85d8 (patch) | |
tree | 9d8a5375c716879142dff583dfa6abddd79fefcc /drivers/media/video/videocodec.c | |
parent | 17fd682e544556a2a829e94383239c029bb21c5e (diff) |
[PATCH] kfree cleanup: drivers/media
This is the drivers/media/ part of the big kfree cleanup patch.
Remove pointless checks for NULL prior to calling kfree() in drivers/media/.
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Cc: Johannes Stezenbach <js@linuxtv.org>
Cc: Michael Krufky <mkrufky@m1k.net>
Cc: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Acked-by : Manu Abraham <manu@linuxtv.org>
Acked-by: Andreas Oberritter <obi@linuxtv.org>
Acked-by: Wilson Michaels <wilsonmichaels@earthlink.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/videocodec.c')
-rw-r--r-- | drivers/media/video/videocodec.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/videocodec.c b/drivers/media/video/videocodec.c index c9d5f1a873cc..839db622040d 100644 --- a/drivers/media/video/videocodec.c +++ b/drivers/media/video/videocodec.c | |||
@@ -353,8 +353,7 @@ videocodec_build_table (void) | |||
353 | dprintk(3, "videocodec_build table: %d entries, %d bytes\n", i, | 353 | dprintk(3, "videocodec_build table: %d entries, %d bytes\n", i, |
354 | size); | 354 | size); |
355 | 355 | ||
356 | if (videocodec_buf) | 356 | kfree(videocodec_buf); |
357 | kfree(videocodec_buf); | ||
358 | videocodec_buf = (char *) kmalloc(size, GFP_KERNEL); | 357 | videocodec_buf = (char *) kmalloc(size, GFP_KERNEL); |
359 | 358 | ||
360 | i = 0; | 359 | i = 0; |
@@ -471,8 +470,7 @@ videocodec_exit (void) | |||
471 | { | 470 | { |
472 | #ifdef CONFIG_PROC_FS | 471 | #ifdef CONFIG_PROC_FS |
473 | remove_proc_entry("videocodecs", NULL); | 472 | remove_proc_entry("videocodecs", NULL); |
474 | if (videocodec_buf) | 473 | kfree(videocodec_buf); |
475 | kfree(videocodec_buf); | ||
476 | #endif | 474 | #endif |
477 | } | 475 | } |
478 | 476 | ||