From 7b04afe9cdfa217d49a48e20a7f35eab45b9fc09 Mon Sep 17 00:00:00 2001 From: Michael Hunold Date: Mon, 20 Oct 2003 17:55:50 -0700 Subject: [PATCH] [PATCH] Fix bug in saa7146 analog tv i2c-handling - remove cruft, add I2C_ADAP_CLASS_TV_ANALOG identifier for analog tv i2c handler --- drivers/media/common/saa7146_i2c.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c index 392f131bf68..a5d35f5efa0 100644 --- a/drivers/media/common/saa7146_i2c.c +++ b/drivers/media/common/saa7146_i2c.c @@ -409,11 +409,8 @@ 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)); strcpy(i2c_adapter->name, dev->name); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) - i2c_adapter->data = dev; -#else i2c_set_adapdata(i2c_adapter,dev); -#endif + i2c_adapter->class = I2C_ADAP_CLASS_TV_ANALOG; i2c_adapter->algo = &saa7146_algo; i2c_adapter->algo_data = NULL; i2c_adapter->id = I2C_ALGO_SAA7146; -- 2.11.4.GIT