summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/v4l1-compat.c
diff options
context:
space:
mode:
authorJesper Juhl <jesper.juhl@gmail.com>2005-11-07 10:01:31 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 16:54:04 +0100
commit2ea7533060e361810c21b2f5ee02151c4dfb85d8 (patch)
tree9d8a5375c716879142dff583dfa6abddd79fefcc /drivers/media/video/v4l1-compat.c
parent[PATCH] kfree cleanup: drivers/s390 (diff)
downloadlinux-2ea7533060e361810c21b2f5ee02151c4dfb85d8.tar.xz
linux-2ea7533060e361810c21b2f5ee02151c4dfb85d8.zip
[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/v4l1-compat.c')
-rw-r--r--drivers/media/video/v4l1-compat.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index 59bb71381a1b..d679ca23ded7 100644
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
@@ -1006,10 +1006,8 @@ v4l_compat_translate_ioctl(struct inode *inode,
break;
}
- if (cap2)
- kfree(cap2);
- if (fmt2)
- kfree(fmt2);
+ kfree(cap2);
+ kfree(fmt2);
return err;
}