diff --git a/[refs] b/[refs]
index 42c772d5c28c..b4ba959dbe86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7919d520f4c9a064ae14bc4dd170c4c12ead2af
+refs/heads/master: fa746aee336fedfe25e6945e5967399966948420
diff --git a/trunk/drivers/media/video/tda8290.c b/trunk/drivers/media/video/tda8290.c
index 245b202560b5..a39cb1f9e875 100644
--- a/trunk/drivers/media/video/tda8290.c
+++ b/trunk/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);