From 6cd36a13d678fba3d53a833d940917ae62c0f4c5 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Wed, 24 Oct 2007 09:30:17 -0300
Subject: [PATCH] --- yaml --- r: 76319 b: refs/heads/master c:
 a72dd305f99f6c6e4eff01478ae53fc80ce98fb1 h: refs/heads/master i:   76317:
 34ed38226a65e0afc8ed1653f353a7fbd5a4a636   76315:
 53abc9f4a547e48b68ee3e1f5ed793148c959cb5   76311:
 95b56acb31775ff1aa1402c5fce1688cdd876e1a   76303:
 bca349f73995a1d5662d7dc8101ab2e02fc21fb8   76287:
 9c66f6433b872cd0956a8072fb2ee7b7cc863976 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/media/video/tda8290.c | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index faaad8331e3c..37d291020f0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2be1b48fd27a3b6878db034288ed571b03df3a5c
+refs/heads/master: a72dd305f99f6c6e4eff01478ae53fc80ce98fb1
diff --git a/trunk/drivers/media/video/tda8290.c b/trunk/drivers/media/video/tda8290.c
index 1b19b93eabec..5975c548b8a6 100644
--- a/trunk/drivers/media/video/tda8290.c
+++ b/trunk/drivers/media/video/tda8290.c
@@ -50,14 +50,15 @@ struct tda8290_priv {
 
 /*---------------------------------------------------------------------*/
 
-static void tda8290_i2c_bridge(struct dvb_frontend *fe, int close)
+static int tda8290_i2c_bridge(struct dvb_frontend *fe, int close)
 {
 	struct tda8290_priv *priv = fe->analog_demod_priv;
 
 	unsigned char  enable[2] = { 0x21, 0xC0 };
 	unsigned char disable[2] = { 0x21, 0x00 };
 	unsigned char *msg;
-	if(close) {
+
+	if (close) {
 		msg = enable;
 		tuner_i2c_xfer_send(&priv->i2c_props, msg, 2);
 		/* let the bridge stabilize */
@@ -66,9 +67,11 @@ static void tda8290_i2c_bridge(struct dvb_frontend *fe, int close)
 		msg = disable;
 		tuner_i2c_xfer_send(&priv->i2c_props, msg, 2);
 	}
+
+	return 0;
 }
 
-static void tda8295_i2c_bridge(struct dvb_frontend *fe, int close)
+static int tda8295_i2c_bridge(struct dvb_frontend *fe, int close)
 {
 	struct tda8290_priv *priv = fe->analog_demod_priv;
 
@@ -76,6 +79,7 @@ static void tda8295_i2c_bridge(struct dvb_frontend *fe, int close)
 	unsigned char disable[2] = { 0x46, 0x00 };
 	unsigned char buf[3] = { 0x45, 0x01, 0x00 };
 	unsigned char *msg;
+
 	if (close) {
 		msg = enable;
 		tuner_i2c_xfer_send(&priv->i2c_props, msg, 2);
@@ -94,6 +98,8 @@ static void tda8295_i2c_bridge(struct dvb_frontend *fe, int close)
 		msg[1] |= 0x04;
 		tuner_i2c_xfer_send(&priv->i2c_props, msg, 2);
 	}
+
+	return 0;
 }
 
 /*---------------------------------------------------------------------*/
@@ -517,6 +523,7 @@ static struct analog_tuner_ops tda8290_tuner_ops = {
 	.has_signal     = tda8290_has_signal,
 	.standby        = tda8290_standby,
 	.release        = tda829x_release,
+	.i2c_gate_ctrl  = tda8290_i2c_bridge,
 };
 
 static struct analog_tuner_ops tda8295_tuner_ops = {
@@ -525,6 +532,7 @@ static struct analog_tuner_ops tda8295_tuner_ops = {
 	.has_signal     = tda8295_has_signal,
 	.standby        = tda8295_standby,
 	.release        = tda829x_release,
+	.i2c_gate_ctrl  = tda8295_i2c_bridge,
 };
 
 int tda8290_attach(struct tuner *t)