From f427186109d2d77019fb2f076b4fcc48039808d3 Mon Sep 17 00:00:00 2001 From: Federico Fuga Date: Fri, 24 Aug 2012 11:54:11 -0300 Subject: [PATCH] --- yaml --- r: 366663 b: refs/heads/master c: 15170025ee26946dc61f3c21e54652c6db4a0326 h: refs/heads/master i: 366661: 1c2f88f03033e0aab9f0ed26ee1f3422c8511758 366659: 8837048e72f7b9385a2044fe7f2ea9bf1352ef2f 366655: b218d3833dfd995e11ec566bf3ced6205afbd095 v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/omap/omap_vout.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2108e966dc04..ba3083cbaafe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01ae72866d31de9291039b6030d021c004f5bfed +refs/heads/master: 15170025ee26946dc61f3c21e54652c6db4a0326 diff --git a/trunk/drivers/media/platform/omap/omap_vout.c b/trunk/drivers/media/platform/omap/omap_vout.c index 96c4a17e4280..477268a2415f 100644 --- a/trunk/drivers/media/platform/omap/omap_vout.c +++ b/trunk/drivers/media/platform/omap/omap_vout.c @@ -648,9 +648,12 @@ static void omap_vout_isr(void *arg, unsigned int irqstatus) /* First save the configuration in ovelray structure */ ret = omapvid_init(vout, addr); - if (ret) + if (ret) { printk(KERN_ERR VOUT_NAME "failed to set overlay info\n"); + goto vout_isr_err; + } + /* Enable the pipeline and set the Go bit */ ret = omapvid_apply_changes(vout); if (ret) @@ -1660,13 +1663,16 @@ static int vidioc_streamon(struct file *file, void *fh, enum v4l2_buf_type i) mask = DISPC_IRQ_VSYNC | DISPC_IRQ_EVSYNC_EVEN | DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_VSYNC2; - omap_dispc_register_isr(omap_vout_isr, vout, mask); - /* First save the configuration in ovelray structure */ ret = omapvid_init(vout, addr); - if (ret) + if (ret) { v4l2_err(&vout->vid_dev->v4l2_dev, "failed to set overlay info\n"); + goto streamon_err1; + } + + omap_dispc_register_isr(omap_vout_isr, vout, mask); + /* Enable the pipeline and set the Go bit */ ret = omapvid_apply_changes(vout); if (ret)