Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c070e38e authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

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



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

Fix accesses to the devnode accordingly.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4b5d8da8

drivers/media/video/omap3isp/ispccdc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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));

drivers/media/video/omap3isp/ispstat.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;