diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-08-23 00:40:06 +0200 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-10-14 13:11:04 +0200 |
| commit | 58b396cc4cd1524004cd4710af79cf70611f5533 (patch) | |
| tree | bea8bf56e620e8414711603644da5480b38d4b3b /isp | |
| parent | acd854a840dbc35796305247598853951ca921e0 (diff) | |
omap3isp: Add isp device field to struct omap3_isp_video
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'isp')
| -rw-r--r-- | isp/omap3isp-priv.h | 2 | ||||
| -rw-r--r-- | isp/omap3isp.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/isp/omap3isp-priv.h b/isp/omap3isp-priv.h index 4e3d8cf..28bcf73 100644 --- a/isp/omap3isp-priv.h +++ b/isp/omap3isp-priv.h @@ -67,6 +67,7 @@ struct omap3_isp_entity { /* * struct omap3_isp_video - OMAP3 video device * @entity: OMAP3 entity + * @isp: OMAP3 ISP device * @video: V4L2 capture device * @format: Current video format * @pool: Buffers pool @@ -76,6 +77,7 @@ struct omap3_isp_entity { */ struct omap3_isp_video { struct omap3_isp_entity entity; + struct omap3_isp_device *isp; struct v4l2_device *video; struct v4l2_mbus_framefmt format; struct v4l2_buffers_pool *pool; diff --git a/isp/omap3isp.c b/isp/omap3isp.c index 3a75d91..f48b7a0 100644 --- a/isp/omap3isp.c +++ b/isp/omap3isp.c @@ -332,7 +332,7 @@ static void omap3_isp_pipeline_destroy(struct omap3_isp_pipeline *pipe) } static struct omap3_isp_pool * -omap3_isp_pipeline_create_pool(struct omap3_isp_device *isp __attribute__((__unused__)), +omap3_isp_pipeline_create_pool(struct omap3_isp_device *isp, const char *name) { struct omap3_isp_pool *pool; @@ -389,6 +389,7 @@ omap3_isp_pipeline_create_entity(struct omap3_isp_device *isp, memset(video, 0, sizeof *video); + video->isp = isp; video->video = v4l2_open(ment->devname); if (video->video == NULL) { printf("error: unable to open video device %s\n", |