Merge branch 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[pandora-kernel.git] / drivers / media / video / ov772x.c

diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c
index c0d9112..0bce255 100644 (file)
--- a/drivers/media/video/ov772x.c
+++ b/drivers/media/video/ov772x.c
@@ -1067,10 +1067,12 @@ static int ov772x_probe(struct i2c_client *client,
        struct i2c_adapter        *adapter = to_i2c_adapter(client->dev.parent);
        int                        ret;
 
-       info = client->dev.platform_data;
-       if (!info)
+       if (!client->dev.platform_data)
                return -EINVAL;
 
+       info = container_of(client->dev.platform_data,
+                           struct ov772x_camera_info, link);
+
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
                dev_err(&adapter->dev,
                        "I2C-Adapter doesn't support "