1 files changed, 5 insertions, 31 deletions

diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
index 993504015963..202d1b4b9bee 100644
--- a/drivers/media/platform/omap/omap_vout.c
+++ b/drivers/media/platform/omap/omap_vout.c
@@ -1174,13 +1174,6 @@ 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);
 
-        /* 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;
-        }
-
         ret = 0;
 
 s_fmt_vid_out_exit:
@@ -1684,20 +1677,6 @@ static int vidioc_streamon(struct file *file, void *fh, enum v4l2_buf_type i)
 
         omap_dispc_register_isr(omap_vout_isr, vout, mask);
 
-        for (j = 0; j < ovid->num_overlays; j++) {
-                struct omap_overlay *ovl = ovid->overlays[j];
-
-                if (ovl->get_device(ovl)) {
-                        struct omap_overlay_info info;
-                        ovl->get_overlay_info(ovl, &info);
-                        info.paddr = addr;
-                        if (ovl->set_overlay_info(ovl, &info)) {
-                                ret = -EINVAL;
-                                goto streamon_err1;
-                        }
-                }
-        }
-
         /* First save the configuration in ovelray structure */
         ret = omapvid_init(vout, addr);
         if (ret)
@@ -2094,11 +2073,12 @@ static int __init omap_vout_create_video_devices(struct platform_device *pdev)
                 }
                 video_set_drvdata(vfd, vout);
 
-                /* Configure the overlay structure */
-                ret = omapvid_init(vid_dev->vouts[k], 0);
-                if (!ret)
-                        goto success;
+                dev_info(&pdev->dev, ": registered and initialized"
+                                " video device %d\n", vfd->minor);
+                if (k == (pdev->num_resources - 1))
+                        return 0;
 
+                continue;
 error2:
                 if (vout->vid_info.rotation_type == VOUT_ROT_VRFB)
                         omap_vout_release_vrfb(vout);
@@ -2108,12 +2088,6 @@ error1:
 error:
                 kfree(vout);
                 return ret;
-
-success:
-                dev_info(&pdev->dev, ": registered and initialized"
-                                " video device %d\n", vfd->minor);
-                if (k == (pdev->num_resources - 1))
-                        return 0;
         }
 
         return -ENODEV;