summaryrefslogtreecommitdiff
path: root/linux/drivers/media/common/saa7146_fops.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-01-12 01:03:42 +0000
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-12 01:03:42 +0000
commitf9b21f5047b96957a8e24bc7d8692be6af1929c0 (patch)
tree99d6925debe83ecac3af8787ba0f335f644cb680 /linux/drivers/media/common/saa7146_fops.c
parent8e7367e788bd47a6a6fa5ab79b290d3b343a7899 (diff)
downloadmediapointer-dvb-s2-f9b21f5047b96957a8e24bc7d8692be6af1929c0.tar.gz
mediapointer-dvb-s2-f9b21f5047b96957a8e24bc7d8692be6af1929c0.tar.bz2
drivers/media/common: Add missing video_device_release
From: Julia Lawall <julia@diku.dk> Video_device_alloc returns the result of a kzalloc. In this case, the value is stored in a local variable which is not copied elsewhere before the point of the error return (video_register_device does not save its first argument anywhere if it returns a negative value). Thus, a video_device_release it needed before the error return. The problem was found using the following semantic match. (http://www.emn.fr/x-info/coccinelle/) // <smpl> @@ type T,T1,T2; identifier E; statement S; expression x1,x2,x3; int ret; @@ T E; ... * E = video_device_alloc(...); if (E == NULL) S ... when != video_device_release(...,(T1)E,...) when != if (E != NULL) { ... video_device_release(...,(T1)E,...); ...} when != x1 = (T1)E when != E = x3; when any if (...) { ... when != video_device_release(...,(T2)E,...) when != if (E != NULL) { ... video_device_release(...,(T2)E,...); ...} when != x2 = (T2)E ( * return; | * return ret; ) } // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> CC: Oliver Endriss <o.endriss@gmx.de> CC: Michael Hunold <michael@mihu.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/common/saa7146_fops.c')
-rw-r--r--linux/drivers/media/common/saa7146_fops.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/drivers/media/common/saa7146_fops.c b/linux/drivers/media/common/saa7146_fops.c
index b0bed2fbb..772b842bf 100644
--- a/linux/drivers/media/common/saa7146_fops.c
+++ b/linux/drivers/media/common/saa7146_fops.c
@@ -539,6 +539,7 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
// fixme: -1 should be an insmod parameter *for the extension* (like "video_nr");
if (video_register_device(vfd, type, -1) < 0) {
ERR(("cannot register v4l2 device. skipping.\n"));
+ video_device_release(vfd);
return -1;
}