diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-08-25 10:06:22 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 23:18:25 -0400 |
commit | bc1937b41d8253e2b554da385023a92189d38917 (patch) | |
tree | c3f4b27fb7b3ff1607191c0eadcacb55aef2b2cf | |
parent | c41debafc6e396a8e15f1f017aec7c0cf67e1b54 (diff) |
V4L/DVB (12505): soc_camera_platform: pass device pointer from soc-camera core on .add_device()
Add a struct device pointer to struct soc_camera_platform_info and let the user
(ap325rxa) pass it down to soc_camera_platform.c in its .add_device() method.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | arch/sh/boards/board-ap325rxa.c | 2 | ||||
-rw-r--r-- | include/media/soc_camera_platform.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c index 7e2d2de0384d..97a2fc97e108 100644 --- a/arch/sh/boards/board-ap325rxa.c +++ b/arch/sh/boards/board-ap325rxa.c | |||
@@ -345,6 +345,8 @@ static int ap325rxa_camera_add(struct soc_camera_link *icl, | |||
345 | if (icl != &camera_info.link || camera_probe() <= 0) | 345 | if (icl != &camera_info.link || camera_probe() <= 0) |
346 | return -ENODEV; | 346 | return -ENODEV; |
347 | 347 | ||
348 | camera_info.dev = dev; | ||
349 | |||
348 | return platform_device_register(&camera_device); | 350 | return platform_device_register(&camera_device); |
349 | } | 351 | } |
350 | 352 | ||
diff --git a/include/media/soc_camera_platform.h b/include/media/soc_camera_platform.h index af224deadb43..3e8f020abf48 100644 --- a/include/media/soc_camera_platform.h +++ b/include/media/soc_camera_platform.h | |||
@@ -14,6 +14,8 @@ | |||
14 | #include <linux/videodev2.h> | 14 | #include <linux/videodev2.h> |
15 | #include <media/soc_camera.h> | 15 | #include <media/soc_camera.h> |
16 | 16 | ||
17 | struct device; | ||
18 | |||
17 | struct soc_camera_platform_info { | 19 | struct soc_camera_platform_info { |
18 | int iface; | 20 | int iface; |
19 | char *format_name; | 21 | char *format_name; |
@@ -21,6 +23,7 @@ struct soc_camera_platform_info { | |||
21 | struct v4l2_pix_format format; | 23 | struct v4l2_pix_format format; |
22 | unsigned long bus_param; | 24 | unsigned long bus_param; |
23 | void (*power)(int); | 25 | void (*power)(int); |
26 | struct device *dev; | ||
24 | int (*set_capture)(struct soc_camera_platform_info *info, int enable); | 27 | int (*set_capture)(struct soc_camera_platform_info *info, int enable); |
25 | struct soc_camera_link link; | 28 | struct soc_camera_link link; |
26 | }; | 29 | }; |