diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-23 14:59:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-23 14:59:08 -0800 |
| commit | 4d18de944954b973fede3259d206022f90549269 (patch) | |
| tree | f022fe447a37406f07a62e18cf270c21a36004e8 /drivers/media | |
| parent | 827fa4c762fa81fbfcd262505588feeeae7a3b66 (diff) | |
| parent | c070e38e4ee005f55895df177a9e14d90d6204b3 (diff) | |
| download | op-kernel-dev-4d18de944954b973fede3259d206022f90549269.zip op-kernel-dev-4d18de944954b973fede3259d206022f90549269.tar.gz | |
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
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/omap3isp/ispccdc.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/omap3isp/ispstat.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/omap3isp/ispccdc.c b/drivers/media/video/omap3isp/ispccdc.c index b0b0fa5..54a4a3f 100644 --- a/drivers/media/video/omap3isp/ispccdc.c +++ b/drivers/media/video/omap3isp/ispccdc.c @@ -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)); diff --git a/drivers/media/video/omap3isp/ispstat.c b/drivers/media/video/omap3isp/ispstat.c index 68d5394..bc0b2c7 100644 --- a/drivers/media/video/omap3isp/ispstat.c +++ b/drivers/media/video/omap3isp/ispstat.c @@ -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; |
