From c9027bbb6837d1f34624334d77948d89c9adcb8d Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Mon, 4 Jul 2011 11:11:42 -0300 Subject: [PATCH] --- yaml --- r: 261540 b: refs/heads/master c: ee893e9adccd7dc22a6cfc5d4f49e7dd0baead0c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/bw-qcam.c | 1 + trunk/drivers/media/video/c-qcam.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index dfaa0bcfa0ee..f5ef7940873b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37f9619dd5df9f1c9878ac53e27033519b8760ec +refs/heads/master: ee893e9adccd7dc22a6cfc5d4f49e7dd0baead0c diff --git a/trunk/drivers/media/video/bw-qcam.c b/trunk/drivers/media/video/bw-qcam.c index 2fc998e9b2f7..f09df9dffaae 100644 --- a/trunk/drivers/media/video/bw-qcam.c +++ b/trunk/drivers/media/video/bw-qcam.c @@ -893,6 +893,7 @@ static struct qcam *qcam_init(struct parport *port) if (v4l2_device_register(NULL, v4l2_dev) < 0) { v4l2_err(v4l2_dev, "Could not register v4l2_device\n"); + kfree(qcam); return NULL; } diff --git a/trunk/drivers/media/video/c-qcam.c b/trunk/drivers/media/video/c-qcam.c index b8d800e60056..cd8ff0473184 100644 --- a/trunk/drivers/media/video/c-qcam.c +++ b/trunk/drivers/media/video/c-qcam.c @@ -750,6 +750,7 @@ static struct qcam *qcam_init(struct parport *port) if (v4l2_device_register(NULL, v4l2_dev) < 0) { v4l2_err(v4l2_dev, "Could not register v4l2_device\n"); + kfree(qcam); return NULL; }