5 files changed, 21 insertions, 3 deletions
diff --git a/linux/drivers/media/video/mxb.c b/linux/drivers/media/video/mxb.c
index 2488aa588..ede397bf2 100644
--- a/linux/drivers/media/video/mxb.c
+++ b/linux/drivers/media/video/mxb.c
@@ -432,10 +432,11 @@ static int mxb_init_done(struct saa7146_dev* dev)
 		   polling method ... */
 		extension.flags &= ~SAA7146_USE_I2C_IRQ;
 		for(i = 1;;i++) {
-			msg.len = mxb_saa7740_init[i].length;		
-			if( -1 == msg.len ) {
+			if( -1 == mxb_saa7740_init[i].length ) {
 				break;
 			}
+
+			msg.len = mxb_saa7740_init[i].length;		
 			msg.buf = &mxb_saa7740_init[i].data[0];
 			if( 1 != (err = i2c_transfer(&mxb->i2c_adapter, &msg, 1))) {
 				DEB_D(("failed to initialize 'sound arena module'.\n"));
diff --git a/linux/drivers/media/video/saa7111.c b/linux/drivers/media/video/saa7111.c
index cac5ddd99..b25b64bfc 100644
--- a/linux/drivers/media/video/saa7111.c
+++ b/linux/drivers/media/video/saa7111.c
@@ -121,7 +121,7 @@ static int saa7111_attach(struct i2c_adapter *adap, int addr, unsigned short fla
 
 	memset(decoder, 0, sizeof(*decoder));
 	decoder->client = client;
-	client->data = decoder;
+	i2c_set_clientdata(client, decoder);
 	decoder->addr = addr;
 	decoder->norm = VIDEO_MODE_NTSC;
 	decoder->input = 0;
@@ -163,8 +163,13 @@ static int saa7111_probe(struct i2c_adapter *adap)
 		return -ENODEV;
 	}
 	
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 	printk("saa7111: probing %s i2c adapter [id=0x%x]\n",
                        adap->name,adap->id);
+#else
+	printk("saa7111: probing %s i2c adapter [id=0x%x]\n",
+                       adap->dev.name,adap->id);
+#endif
 	return i2c_probe(adap, &addr_data, saa7111_attach);
 }
 
diff --git a/linux/drivers/media/video/tda9840.c b/linux/drivers/media/video/tda9840.c
index b5030135a..a3bc1c729 100644
--- a/linux/drivers/media/video/tda9840.c
+++ b/linux/drivers/media/video/tda9840.c
@@ -243,7 +243,11 @@ static int tda9840_attach(struct i2c_adapter *adapter)
 {
 	/* let's see whether this is a know adapter we can attach to */
 	if( adapter->id != I2C_ALGO_SAA7146 ) {
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 		dprintk("tda9840.o: refusing to probe on unknown adapter [name='%s',id=0x%x]\n",adapter->name,adapter->id);
+#else
+		dprintk("tda9840.o: refusing to probe on unknown adapter [name='%s',id=0x%x]\n",adapter->dev.name,adapter->id);
+#endif
 		return -ENODEV;
 	}
 
diff --git a/linux/drivers/media/video/tea6415c.c b/linux/drivers/media/video/tea6415c.c
index fe91e32cb..f8db1aacc 100644
--- a/linux/drivers/media/video/tea6415c.c
+++ b/linux/drivers/media/video/tea6415c.c
@@ -103,7 +103,11 @@ static int tea6415c_attach(struct i2c_adapter *adapter)
 {
 	/* let's see whether this is a know adapter we can attach to */
 	if( adapter->id != I2C_ALGO_SAA7146 ) {
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 		dprintk("tea6415c.o: refusing to probe on unknown adapter [name='%s',id=0x%x]\n",adapter->name,adapter->id);
+#else
+		dprintk("tea6415c.o: refusing to probe on unknown adapter [name='%s',id=0x%x]\n",adapter->dev.name,adapter->id);
+#endif
 		return -ENODEV;
 	}
 
diff --git a/linux/drivers/media/video/tea6420.c b/linux/drivers/media/video/tea6420.c
index aa0ef021e..6619439b0 100644
--- a/linux/drivers/media/video/tea6420.c
+++ b/linux/drivers/media/video/tea6420.c
@@ -151,7 +151,11 @@ static int tea6420_attach(struct i2c_adapter *adapter)
 {
 	/* let's see whether this is a know adapter we can attach to */
 	if( adapter->id != I2C_ALGO_SAA7146 ) {
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 		dprintk("tea6420.o: refusing to probe on unknown adapter [name='%s',id=0x%x]\n",adapter->name,adapter->id);
+#else
+		dprintk("tea6420.o: refusing to probe on unknown adapter [name='%s',id=0x%x]\n",adapter->dev.name,adapter->id);
+#endif
 		return -ENODEV;
 	}