From 953b4b8afa96db88bb21f13a4ee6ac7c880c6b9e Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 13 Jan 2011 12:02:00 -0300
Subject: [PATCH] --- yaml --- r: 232197 b: refs/heads/master c:
 47ab285a960ac456506297c93322ab13c3522f5a h: refs/heads/master i:   232195:
 cea6d928a547d220a5811741e0bd2e49300d2929 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/common/tuners/tda8290.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 811eaba64790..f84fe6bfdd2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 567aba0b7997dad5fe3fb4aeb174ee9018df8c5b
+refs/heads/master: 47ab285a960ac456506297c93322ab13c3522f5a
diff --git a/trunk/drivers/media/common/tuners/tda8290.c b/trunk/drivers/media/common/tuners/tda8290.c
index 5f889c1b91d0..11ea4e0f9c04 100644
--- a/trunk/drivers/media/common/tuners/tda8290.c
+++ b/trunk/drivers/media/common/tuners/tda8290.c
@@ -755,8 +755,11 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
 	}
 
 	if ((!(cfg) || (TDA829X_PROBE_TUNER == cfg->probe_tuner)) &&
-	    (tda829x_find_tuner(fe) < 0))
+	    (tda829x_find_tuner(fe) < 0)) {
+		memset(&fe->ops.analog_ops, 0, sizeof(struct analog_demod_ops));
+
 		goto fail;
+	}
 
 	switch (priv->ver) {
 	case TDA8290: