From f23657a679f108dfcad12c6a3ea52d9fa7a2fabf Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Tue, 25 Aug 2009 11:06:22 -0300 Subject: [PATCH] --- yaml --- r: 164208 b: refs/heads/master c: bc1937b41d8253e2b554da385023a92189d38917 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/boards/board-ap325rxa.c | 2 ++ trunk/include/media/soc_camera_platform.h | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 117cbd830cb6..d604213e35c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c41debafc6e396a8e15f1f017aec7c0cf67e1b54 +refs/heads/master: bc1937b41d8253e2b554da385023a92189d38917 diff --git a/trunk/arch/sh/boards/board-ap325rxa.c b/trunk/arch/sh/boards/board-ap325rxa.c index 7e2d2de0384d..97a2fc97e108 100644 --- a/trunk/arch/sh/boards/board-ap325rxa.c +++ b/trunk/arch/sh/boards/board-ap325rxa.c @@ -345,6 +345,8 @@ static int ap325rxa_camera_add(struct soc_camera_link *icl, if (icl != &camera_info.link || camera_probe() <= 0) return -ENODEV; + camera_info.dev = dev; + return platform_device_register(&camera_device); } diff --git a/trunk/include/media/soc_camera_platform.h b/trunk/include/media/soc_camera_platform.h index af224deadb43..3e8f020abf48 100644 --- a/trunk/include/media/soc_camera_platform.h +++ b/trunk/include/media/soc_camera_platform.h @@ -14,6 +14,8 @@ #include #include +struct device; + struct soc_camera_platform_info { int iface; char *format_name; @@ -21,6 +23,7 @@ struct soc_camera_platform_info { struct v4l2_pix_format format; unsigned long bus_param; void (*power)(int); + struct device *dev; int (*set_capture)(struct soc_camera_platform_info *info, int enable); struct soc_camera_link link; };