---

yaml --- r: 164208 b: refs/heads/master c: bc1937b h: refs/heads/master v: v3
git-mirror · Sep 19, 2009 · f23657a · f23657a
1 parent 446de1d
commit f23657a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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
@@ -14,13 +14,16 @@
 #include <linux/videodev2.h>
 #include <media/soc_camera.h>
 
+struct device;
+
 struct soc_camera_platform_info {
 	int iface;
 	char *format_name;
 	unsigned long format_depth;
 	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;
 };