From 6503e8d69e449d31edfdd9576edd02605100adec Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 11 Nov 2011 11:22:20 -0300 Subject: [PATCH] --- yaml --- r: 285388 b: refs/heads/master c: bd0f2e6da7ea9e225cb2dbd3229e25584b0e9538 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/omap3isp/ispccdc.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 493ed6aec736..1f2d998d29a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec0cae7a56033e52e30d614d883b26b790a47d6e +refs/heads/master: bd0f2e6da7ea9e225cb2dbd3229e25584b0e9538 diff --git a/trunk/drivers/media/video/omap3isp/ispccdc.c b/trunk/drivers/media/video/omap3isp/ispccdc.c index b0b0fa5a3572..9012b57b3cf0 100644 --- a/trunk/drivers/media/video/omap3isp/ispccdc.c +++ b/trunk/drivers/media/video/omap3isp/ispccdc.c @@ -1406,8 +1406,7 @@ static int __ccdc_handle_stopping(struct isp_ccdc_device *ccdc, u32 event) static void ccdc_hs_vs_isr(struct isp_ccdc_device *ccdc) { - struct isp_pipeline *pipe = - to_isp_pipeline(&ccdc->video_out.video.entity); + struct isp_pipeline *pipe = to_isp_pipeline(&ccdc->subdev.entity); struct video_device *vdev = &ccdc->subdev.devnode; struct v4l2_event event;