openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] omap3isp: Fix crash caused by subdevs now having a pointer to devnodes 

Commit 3e0ec41c5c ("V4L: dynamically
allocate video_device nodes in subdevices") makes the
embedding video_device directly.

Fix accesses to the devnode accordingly.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Laurent Pinchart 2011-11-16 10:54:02 -03:00 committed by Mauro Carvalho Chehab
parent 4b5d8da88e
commit c070e38e4e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/omap3isp/ispccdc.c
View File

@ -1408,7 +1408,7 @@ static void ccdc_hs_vs_isr(struct isp_ccdc_device *ccdc)
{ {
struct isp_pipeline *pipe = struct isp_pipeline *pipe =
to_isp_pipeline(&ccdc->video_out.video.entity); to_isp_pipeline(&ccdc->video_out.video.entity);
struct video_device *vdev = &ccdc->subdev.devnode; struct video_device *vdev = ccdc->subdev.devnode;
struct v4l2_event event; struct v4l2_event event;
memset(&event, 0, sizeof(event)); memset(&event, 0, sizeof(event));

2
drivers/media/video/omap3isp/ispstat.c
View File

@ -496,7 +496,7 @@ static int isp_stat_bufs_alloc(struct ispstat *stat, u32 size)
static void isp_stat_queue_event(struct ispstat *stat, int err) static void isp_stat_queue_event(struct ispstat *stat, int err)
{ {
struct video_device *vdev = &stat->subdev.devnode; struct video_device *vdev = stat->subdev.devnode;
struct v4l2_event event; struct v4l2_event event;
struct omap3isp_stat_event_status *status = (void *)event.u.data; struct omap3isp_stat_event_status *status = (void *)event.u.data;