From c4c32fab4a27716a5e673a31ed8c73cbec326102 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Tue, 22 Apr 2008 14:46:02 -0300
Subject: [PATCH] --- yaml --- r: 92501 b: refs/heads/master c:
 50407f99a1fd7fcca74e53b1852dc70deb5114db h: refs/heads/master i:   92499:
 ebf5f3d943273303b217d154f8ddd75aadde0246 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/cx88/cx88-dvb.c       | 2 +-
 trunk/drivers/media/video/saa7134/saa7134-dvb.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 578b5c67fb3f..1b6a12eb7174 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a920e42f61bdfe9974f3e2f3715d3a6d319eeaba
+refs/heads/master: 50407f99a1fd7fcca74e53b1852dc70deb5114db
diff --git a/trunk/drivers/media/video/cx88/cx88-dvb.c b/trunk/drivers/media/video/cx88/cx88-dvb.c
index d72b817bf886..37ebfcc6be55 100644
--- a/trunk/drivers/media/video/cx88/cx88-dvb.c
+++ b/trunk/drivers/media/video/cx88/cx88-dvb.c
@@ -458,7 +458,7 @@ static int attach_xc3028(u8 addr, struct cx8802_dev *dev)
 	struct xc2028_config cfg = {
 		.i2c_adap  = &dev->core->i2c_adap,
 		.i2c_addr  = addr,
-		.video_dev = dev->core,
+		.video_dev = dev->core->i2c_adap.algo_data,
 	};
 
 	if (!dev->dvb.frontend) {
diff --git a/trunk/drivers/media/video/saa7134/saa7134-dvb.c b/trunk/drivers/media/video/saa7134/saa7134-dvb.c
index 97d9178dca2b..00f325ad565a 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-dvb.c
@@ -1166,7 +1166,7 @@ static int dvb_init(struct saa7134_dev *dev)
 		struct xc2028_config cfg = {
 			.i2c_adap  = &dev->i2c_adap,
 			.i2c_addr  = 0x61,
-			.video_dev = dev,
+			.video_dev = dev->i2c_adap.algo_data,
 		};
 		fe = dvb_attach(xc2028_attach, dev->dvb.frontend, &cfg);
 		if (!fe) {