diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-05-12 11:13:32 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-17 03:22:34 -0400 |
commit | 0a861e9eb76c68b23be1aa4758269c5b412089a9 (patch) | |
tree | 4ec2284a725039e95dedd11b3b1fba6ead012349 /drivers/media/video/tw9910.c | |
parent | f73c8f53ccc13ae13c6dbfa002083448a5ad0c81 (diff) |
soc-camera: unify i2c camera device platform data
Unify i2c camera device platform data to point to struct soc_camera_link
for a smooth transition to soc-camera as a platform driver.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/media/video/tw9910.c')
-rw-r--r-- | drivers/media/video/tw9910.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c index a39947643992..aa5065ea09ed 100644 --- a/drivers/media/video/tw9910.c +++ b/drivers/media/video/tw9910.c | |||
@@ -875,10 +875,12 @@ static int tw9910_probe(struct i2c_client *client, | |||
875 | const struct tw9910_scale_ctrl *scale; | 875 | const struct tw9910_scale_ctrl *scale; |
876 | int i, ret; | 876 | int i, ret; |
877 | 877 | ||
878 | info = client->dev.platform_data; | 878 | if (!client->dev.platform_data) |
879 | if (!info) | ||
880 | return -EINVAL; | 879 | return -EINVAL; |
881 | 880 | ||
881 | info = container_of(client->dev.platform_data, | ||
882 | struct tw9910_video_info, link); | ||
883 | |||
882 | if (!i2c_check_functionality(to_i2c_adapter(client->dev.parent), | 884 | if (!i2c_check_functionality(to_i2c_adapter(client->dev.parent), |
883 | I2C_FUNC_SMBUS_BYTE_DATA)) { | 885 | I2C_FUNC_SMBUS_BYTE_DATA)) { |
884 | dev_err(&client->dev, | 886 | dev_err(&client->dev, |