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

Commit 4d18de94 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] omap3isp: Fix crash caused by subdevs now having a pointer to devnodes
parents 827fa4c7 c070e38e

drivers/media/video/omap3isp/ispccdc.c

+1 −1
Original line number Diff line number Diff line
@@ -1408,7 +1408,7 @@ static void ccdc_hs_vs_isr(struct isp_ccdc_device *ccdc) 
{

	struct isp_pipeline *pipe =

		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;



	memset(&event, 0, sizeof(event));

drivers/media/video/omap3isp/ispstat.c

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

{

	struct video_device *vdev = &stat->subdev.devnode;

	struct video_device *vdev = stat->subdev.devnode;

	struct v4l2_event event;

	struct omap3isp_stat_event_status *status = (void *)event.u.data;