V4L/DVB (10497): saa7146: i2c adapdata now points to v4l2_device.

[linux-2.6-omap-h63xx.git] / drivers / media / common / saa7146_i2c.c

diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c
index c11da4d09cd0971d17487371fd6d1b7967894ac4..1b64074a92da10c2adc95fca8cda8fcf17bbc86d 100644 (file)
--- a/drivers/media/common/saa7146_i2c.c
+++ b/drivers/media/common/saa7146_i2c.c
@@ -390,7 +390,8 @@ out:
 /* utility functions */
 static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, int num)
 {
-       struct saa7146_dev* dev = i2c_get_adapdata(adapter);
+       struct v4l2_device *v4l2_dev = i2c_get_adapdata(adapter);
+       struct saa7146_dev *dev = to_saa7146_dev(v4l2_dev);
 
        /* use helper function to transfer data */
        return saa7146_i2c_transfer(dev, msg, num, adapter->retries);
@@ -419,7 +420,7 @@ int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c
 
        if( NULL != i2c_adapter ) {
                BUG_ON(!i2c_adapter->class);
-               i2c_set_adapdata(i2c_adapter,dev);
+               i2c_set_adapdata(i2c_adapter, &dev->v4l2_dev);
                i2c_adapter->dev.parent    = &dev->pci->dev;
                i2c_adapter->algo          = &saa7146_algo;
                i2c_adapter->algo_data     = NULL;