summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
authorMichael Hunold <devnull@localhost>2003-10-16 08:30:09 +0000
committerMichael Hunold <devnull@localhost>2003-10-16 08:30:09 +0000
commit378a2c1d728830fc39ff03adcbe4d87b4c33690e (patch)
treefa5bb0a95422ca303ad85f187662d039f9194981 /linux/drivers
parentbc06d6dfc3f92f52f78be6aeac0b4f7222d26dab (diff)
downloadmediapointer-dvb-s2-378a2c1d728830fc39ff03adcbe4d87b4c33690e.tar.gz
mediapointer-dvb-s2-378a2c1d728830fc39ff03adcbe4d87b4c33690e.tar.bz2
- fix usage of i2c name field (has been changed again, see this for more
details: http://linus.bkbits.net:8080/linux-2.5/cset@1.1123.4.1?nav=index.html|src/.|src/drivers|src/drivers/media|src/drivers/media/common|related/drivers/media/common/saa7146_i2c.c
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/common/saa7146_i2c.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/common/saa7146_i2c.c b/linux/drivers/media/common/saa7146_i2c.c
index b787f63cc..bd2022120 100644
--- a/linux/drivers/media/common/saa7146_i2c.c
+++ b/linux/drivers/media/common/saa7146_i2c.c
@@ -408,11 +408,10 @@ int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c
if( NULL != i2c_adapter ) {
memset(i2c_adapter,0,sizeof(struct i2c_adapter));
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
strcpy(i2c_adapter->name, dev->name);
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
i2c_adapter->data = dev;
#else
- strcpy(i2c_adapter->dev.name, dev->name);
i2c_set_adapdata(i2c_adapter,dev);
#endif
i2c_adapter->algo = &saa7146_algo;