File 0007-omap_vout-removed-omapvid_init-calls-that-led-to-seg.patch of Package kernel-adaptation-dm3730

From ffa248e6d6d7b58483c084be580d7aea12e5f5f0 Mon Sep 17 00:00:00 2001
From: MediStream-Devel-VM <info@berlinux-solutions.de>
Date: Mon, 6 Aug 2012 11:19:07 +0200
Subject: [PATCH 7/9] omap_vout: -removed omapvid_init() calls that led to
 segfaults

---
 drivers/media/video/omap/omap_vout.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
index 88cf9d9..a94b0a7 100644
--- a/drivers/media/video/omap/omap_vout.c
+++ b/drivers/media/video/omap/omap_vout.c
@@ -1157,12 +1157,14 @@ static int vidioc_s_fmt_vid_out(struct file *file, void *fh,
 	/* set default crop and win */
 	omap_vout_new_format(&vout->pix, &vout->fbuf, &vout->crop, &vout->win);
 
+#if 0
 	/* Save the changes in the overlay strcuture */
 	ret = omapvid_init(vout, 0);
 	if (ret) {
 		v4l2_err(&vout->vid_dev->v4l2_dev, "failed to change mode\n");
 		goto s_fmt_vid_out_exit;
 	}
+#endif
 
 	ret = 0;
 
@@ -1664,6 +1666,7 @@ static int vidioc_streamon(struct file *file, void *fh, enum v4l2_buf_type i)
 
 	omap_dispc_register_isr(omap_vout_isr, vout, mask);
 
+#if 0
 	for (j = 0; j < ovid->num_overlays; j++) {
 		struct omap_overlay *ovl = ovid->overlays[j];
 
@@ -1677,6 +1680,7 @@ static int vidioc_streamon(struct file *file, void *fh, enum v4l2_buf_type i)
 			}
 		}
 	}
+#endif
 
 	/* First save the configuration in ovelray structure */
 	ret = omapvid_init(vout, addr);
@@ -2071,10 +2075,19 @@ static int __init omap_vout_create_video_devices(struct platform_device *pdev)
 		}
 		video_set_drvdata(vfd, vout);
 
+#if 0
 		/* Configure the overlay structure */
 		ret = omapvid_init(vid_dev->vouts[k], 0);
 		if (!ret)
 			goto success;
+#else
+		dev_info(&pdev->dev, ": registered and initialized"
+				" video device %d\n", vfd->minor);
+		if (k == (pdev->num_resources - 1))
+			return 0;
+
+		continue;
+#endif
 
 error2:
 		if (vout->vid_info.rotation_type == VOUT_ROT_VRFB)
@@ -2086,11 +2099,13 @@ error:
 		kfree(vout);
 		return ret;
 
+#if 0
 success:
 		dev_info(&pdev->dev, ": registered and initialized"
 				" video device %d\n", vfd->minor);
 		if (k == (pdev->num_resources - 1))
 			return 0;
+#endif
 	}
 
 	return -ENODEV;
-- 
1.7.5.4