diff options
Diffstat (limited to 'drivers/media/common/saa7146_i2c.c')
-rw-r--r-- | drivers/media/common/saa7146_i2c.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c index 781f23f0cbcc..6284894505c6 100644 --- a/drivers/media/common/saa7146_i2c.c +++ b/drivers/media/common/saa7146_i2c.c | |||
@@ -387,8 +387,6 @@ static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, in | |||
387 | 387 | ||
388 | /* exported algorithm data */ | 388 | /* exported algorithm data */ |
389 | static struct i2c_algorithm saa7146_algo = { | 389 | static struct i2c_algorithm saa7146_algo = { |
390 | .name = "saa7146 i2c algorithm", | ||
391 | .id = I2C_ALGO_SAA7146, | ||
392 | .master_xfer = saa7146_i2c_xfer, | 390 | .master_xfer = saa7146_i2c_xfer, |
393 | .functionality = saa7146_i2c_func, | 391 | .functionality = saa7146_i2c_func, |
394 | }; | 392 | }; |
@@ -412,7 +410,7 @@ int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c | |||
412 | #endif | 410 | #endif |
413 | i2c_adapter->algo = &saa7146_algo; | 411 | i2c_adapter->algo = &saa7146_algo; |
414 | i2c_adapter->algo_data = NULL; | 412 | i2c_adapter->algo_data = NULL; |
415 | i2c_adapter->id = I2C_ALGO_SAA7146; | 413 | i2c_adapter->id = I2C_HW_SAA7146; |
416 | i2c_adapter->timeout = SAA7146_I2C_TIMEOUT; | 414 | i2c_adapter->timeout = SAA7146_I2C_TIMEOUT; |
417 | i2c_adapter->retries = SAA7146_I2C_RETRIES; | 415 | i2c_adapter->retries = SAA7146_I2C_RETRIES; |
418 | } | 416 | } |