---

yaml --- r: 92410 b: refs/heads/master c: 446018d h: refs/heads/master v: v3
git-mirror · Apr 24, 2008 · 68cd8a0 · 68cd8a0
1 parent a50bd53
commit 68cd8a0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fe8736955515f5075bef05c366b2d145d29cd44
+refs/heads/master: 446018d80736ab16a117ce0db5a20467c91a0f90
diff --git a/trunk/drivers/media/dvb/frontends/tda827x.c b/trunk/drivers/media/dvb/frontends/tda827x.c
@@ -578,17 +578,15 @@ static void tda827xa_lna_gain(struct dvb_frontend *fe, int high,
 		else
 			arg = 0;
 		if (priv->cfg->tuner_callback)
-			priv->cfg->tuner_callback(priv->i2c_adap->algo_data,
-						  1, arg);
+			priv->cfg->tuner_callback(priv, 1, arg);
 		buf[1] = high ? 0 : 1;
 		if (*priv->cfg->config == 2)
 			buf[1] = high ? 1 : 0;
 		i2c_transfer(priv->i2c_adap, &msg, 1);
 		break;
 	case 3: /* switch with GPIO of saa713x */
 		if (priv->cfg->tuner_callback)
-			priv->cfg->tuner_callback(priv->i2c_adap->algo_data,
-						  0, high);
+			priv->cfg->tuner_callback(priv, 0, high);
 		break;
 	}
 }

diff --git a/trunk/drivers/media/video/saa7134/saa7134-core.c b/trunk/drivers/media/video/saa7134/saa7134-core.c
@@ -145,7 +145,8 @@ void saa7134_set_gpio(struct saa7134_dev *dev, int bit_no, int value)
 int saa7134_tuner_callback(void *ptr, int command, int arg)
 {
 	u8 sync_control;
-	struct saa7134_dev *dev = ptr;
+	struct i2c_algo_bit_data *i2c_algo = priv;
+	struct saa7134_dev *dev = i2c_algo->data;
 
 	switch (dev->tuner_type) {
 	case TUNER_PHILIPS_TDA8290: