Merge tag 'v3.8-rc1' into staging/for_v3.9

[sfrench/cifs-2.6.git] / drivers / media / platform / omap / omap_vout.c

diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
index c74b0d48dcd69ea9152882c680c5c60327597f0c..dade3ceab0927282e3d08d6f10e705f3bd1759c8 100644 (file)
--- a/drivers/media/platform/omap/omap_vout.c
+++ b/drivers/media/platform/omap/omap_vout.c
@@ -44,9 +44,7 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
 
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
 

-#include <plat/cpu.h>
-#include <plat/dma.h>
-#include <plat/vrfb.h>
+#include <video/omapvrfb.h>

 #include <video/omapdss.h>
 
 #include "omap_voutlib.h"
 #include <video/omapdss.h>
 
 #include "omap_voutlib.h"


@@ -2027,7 +2025,7 @@ static int __init omap_vout_create_video_devices(struct platform_device *pdev)
                vout->vid_info.id = k + 1;
 
                /* Set VRFB as rotation_type for omap2 and omap3 */
                vout->vid_info.id = k + 1;
 
                /* Set VRFB as rotation_type for omap2 and omap3 */

-               if (cpu_is_omap24xx() || cpu_is_omap34xx())
+               if (omap_vout_dss_omap24xx() || omap_vout_dss_omap34xx())

                        vout->vid_info.rotation_type = VOUT_ROT_VRFB;
 
                /* Setup the default configuration for the video devices
                        vout->vid_info.rotation_type = VOUT_ROT_VRFB;
 
                /* Setup the default configuration for the video devices


@@ -2144,14 +2142,23 @@ static int __init omap_vout_probe(struct platform_device *pdev)
        struct omap_dss_device *def_display;
        struct omap2video_device *vid_dev = NULL;
 
        struct omap_dss_device *def_display;
        struct omap2video_device *vid_dev = NULL;
 

+       ret = omapdss_compat_init();
+       if (ret) {
+               dev_err(&pdev->dev, "failed to init dss\n");
+               return ret;
+       }
+

        if (pdev->num_resources == 0) {
                dev_err(&pdev->dev, "probed for an unknown device\n");
        if (pdev->num_resources == 0) {
                dev_err(&pdev->dev, "probed for an unknown device\n");

-               return -ENODEV;
+               ret = -ENODEV;
+               goto err_dss_init;

        }
 
        vid_dev = kzalloc(sizeof(struct omap2video_device), GFP_KERNEL);
        }
 
        vid_dev = kzalloc(sizeof(struct omap2video_device), GFP_KERNEL);

-       if (vid_dev == NULL)
-               return -ENOMEM;
+       if (vid_dev == NULL) {
+               ret = -ENOMEM;
+               goto err_dss_init;
+       }

 
        vid_dev->num_displays = 0;
        for_each_dss_dev(dssdev) {
 
        vid_dev->num_displays = 0;
        for_each_dss_dev(dssdev) {


@@ -2246,6 +2253,8 @@ probe_err1:
        }
 probe_err0:
        kfree(vid_dev);
        }
 probe_err0:
        kfree(vid_dev);

+err_dss_init:
+       omapdss_compat_uninit();

        return ret;
 }
 
        return ret;
 }