From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sun, 9 Dec 2007 08:16:10 +0000 (-0300)
Subject: V4L/DVB (6784): tda8290: prevent possible memory leak
X-Git-Tag: v2.6.25-rc1~1235^2~220
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa746aee336fedfe25e6945e5967399966948420;p=linux-2.6

V4L/DVB (6784): tda8290: prevent possible memory leak

Always call tda829x_release if tda829x_attach fails for a reason
other than failure to allocate memory for private structure.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/tda8290.c b/drivers/media/video/tda8290.c
index 245b202560..a39cb1f9e8 100644
--- a/drivers/media/video/tda8290.c
+++ b/drivers/media/video/tda8290.c
@@ -704,7 +704,7 @@ int tda829x_attach(struct tuner *t)
 	}
 
 	if (tda829x_find_tuner(fe) < 0)
-		return -EINVAL;
+		goto fail;
 
 	if (priv->ver & TDA8290) {
 		tda8290_init_tuner(fe);
@@ -717,6 +717,11 @@ int tda829x_attach(struct tuner *t)
 	t->mode = V4L2_TUNER_ANALOG_TV;
 
 	return 0;
+
+fail:
+	tda829x_release(fe);
+	fe->ops.analog_demod_ops = NULL;
+	return -EINVAL;
 }
 EXPORT_SYMBOL_GPL(tda829x_attach);