From 378a2c1d728830fc39ff03adcbe4d87b4c33690e Mon Sep 17 00:00:00 2001 From: Michael Hunold Date: Thu, 16 Oct 2003 08:30:09 +0000 Subject: - 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 --- linux/drivers/media/common/saa7146_i2c.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'linux/drivers') 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; -- cgit v1.2.3