The patch number 12195 was added via Mauro Carvalho Chehab <mche...@redhat.com>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Mauro Carvalho Chehab <mche...@redhat.com>
backport commit 0a861e9eb76c68b23be1aa4758269c5b412089a9
kernel-sync:
Author: Guennadi Liakhovetski <g.liakhovet...@gmx.de>
Date: Tue May 12 15:13:32 2009 +0000
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: Mauro Carvalho Chehab <mche...@redhat.com>
---
linux/drivers/media/video/ov772x.c | 6 ++++--
linux/drivers/media/video/tw9910.c | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff -r 17c855868ee8 -r 1af5233017e6 linux/drivers/media/video/ov772x.c
--- a/linux/drivers/media/video/ov772x.c Sun Jul 05 14:59:27 2009 -0300
+++ b/linux/drivers/media/video/ov772x.c Sun Jul 05 15:27:33 2009 -0300
@@ -1071,9 +1071,11 @@ static int ov772x_probe(struct i2c_clien
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,
diff -r 17c855868ee8 -r 1af5233017e6 linux/drivers/media/video/tw9910.c
--- a/linux/drivers/media/video/tw9910.c Sun Jul 05 14:59:27 2009 -0300
+++ b/linux/drivers/media/video/tw9910.c Sun Jul 05 15:27:33 2009 -0300
@@ -879,9 +879,11 @@ static int tw9910_probe(struct i2c_clien
const struct tw9910_scale_ctrl *scale;
int i, ret;
- info = client->dev.platform_data;
- if (!info)
+ if (!client->dev.platform_data)
return -EINVAL;
+
+ info = container_of(client->dev.platform_data,
+ struct tw9910_video_info, link);
if (!i2c_check_functionality(to_i2c_adapter(client->dev.parent),
I2C_FUNC_SMBUS_BYTE_DATA)) {
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/1af5233017e6b22237dde0948e52a4a71d5e79cb
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
