diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-17 09:26:39 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-17 09:26:39 -0300 |
| commit | 70b6522b7a4c42541d81f2460e3be8946e22856d (patch) | |
| tree | 47c109ada3e624ef0e772f97730aef28fa3b578c /linux/drivers/media/video/soc_camera_platform.c | |
| parent | 14db198f2e10236768bd1e8f685e7d65880ca406 (diff) | |
| parent | 55478ad148cbf89cd3d99872759960c8411ada6d (diff) | |
| download | mediapointer-dvb-s2-70b6522b7a4c42541d81f2460e3be8946e22856d.tar.gz mediapointer-dvb-s2-70b6522b7a4c42541d81f2460e3be8946e22856d.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/hcw-ids
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/soc_camera_platform.c')
| -rw-r--r-- | linux/drivers/media/video/soc_camera_platform.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/linux/drivers/media/video/soc_camera_platform.c b/linux/drivers/media/video/soc_camera_platform.c index 1adc257eb..bb7a9d480 100644 --- a/linux/drivers/media/video/soc_camera_platform.c +++ b/linux/drivers/media/video/soc_camera_platform.c @@ -18,15 +18,7 @@ #include <linux/videodev2.h> #include <media/v4l2-common.h> #include <media/soc_camera.h> - -struct soc_camera_platform_info { - int iface; - char *format_name; - unsigned long format_depth; - struct v4l2_pix_format format; - unsigned long bus_param; - int (*set_capture)(struct soc_camera_platform_info *info, int enable); -}; +#include <media/soc_camera_platform.h> struct soc_camera_platform_priv { struct soc_camera_platform_info *info; @@ -44,11 +36,21 @@ soc_camera_platform_get_info(struct soc_camera_device *icd) static int soc_camera_platform_init(struct soc_camera_device *icd) { + struct soc_camera_platform_info *p = soc_camera_platform_get_info(icd); + + if (p->power) + p->power(1); + return 0; } static int soc_camera_platform_release(struct soc_camera_device *icd) { + struct soc_camera_platform_info *p = soc_camera_platform_get_info(icd); + + if (p->power) + p->power(0); + return 0; } |