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/arv.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/arv.c')
-rw-r--r-- | drivers/media/video/arv.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c index 87fd3a7bb392..0823ddaf7004 100644 --- a/drivers/media/video/arv.c +++ b/drivers/media/video/arv.c | |||
@@ -865,10 +865,8 @@ out_dev: | |||
865 | 865 | ||
866 | out_irq: | 866 | out_irq: |
867 | #endif | 867 | #endif |
868 | for (i = 0; i < MAX_AR_HEIGHT; i++) { | 868 | for (i = 0; i < MAX_AR_HEIGHT; i++) |
869 | if (ar->frame[i]) | 869 | kfree(ar->frame[i]); |
870 | kfree(ar->frame[i]); | ||
871 | } | ||
872 | 870 | ||
873 | out_line_buff: | 871 | out_line_buff: |
874 | #if USE_INT | 872 | #if USE_INT |
@@ -899,10 +897,8 @@ static void __exit ar_cleanup_module(void) | |||
899 | #if USE_INT | 897 | #if USE_INT |
900 | free_irq(M32R_IRQ_INT3, ar); | 898 | free_irq(M32R_IRQ_INT3, ar); |
901 | #endif | 899 | #endif |
902 | for (i = 0; i < MAX_AR_HEIGHT; i++) { | 900 | for (i = 0; i < MAX_AR_HEIGHT; i++) |
903 | if (ar->frame[i]) | 901 | kfree(ar->frame[i]); |
904 | kfree(ar->frame[i]); | ||
905 | } | ||
906 | #if USE_INT | 902 | #if USE_INT |
907 | kfree(ar->line_buff); | 903 | kfree(ar->line_buff); |
908 | #endif | 904 | #endif |