OMAPDSS: OMAPFB: Fix fb initialization

[android-sdk/kernel-video.git] / drivers / video / omap2 / omapfb / omapfb-main.c

diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
old mode 100644 (file)
new mode 100755 (executable)
index 90dc201..a6b7e4c
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2709,6 +2709,12 @@ static int __init omapfb_probe(struct platform_device *pdev)
                r = -EINVAL;
                goto cleanup;
        }
+       fbdev->num_overlays = omap_dss_get_num_overlays();
+       for (i = 0; i < fbdev->num_overlays; i++)
+               fbdev->overlays[i] = omap_dss_get_overlay(i);
+       fbdev->num_managers = omap_dss_get_num_overlay_managers();
+       for (i = 0; i < fbdev->num_managers; i++)
+               fbdev->managers[i] = omap_dss_get_overlay_manager(i);
 
        def_display = NULL;
 
@@ -2739,10 +2745,6 @@ static int __init omapfb_probe(struct platform_device *pdev)
                goto cleanup;
        }
 
-       fbdev->num_managers = omap_dss_get_num_overlay_managers();
-       for (i = 0; i < fbdev->num_managers; i++)
-               fbdev->managers[i] = omap_dss_get_overlay_manager(i);
-
        if (def_mode && strlen(def_mode) > 0) {
                if (omapfb_parse_def_modes(fbdev))
                        dev_warn(&pdev->dev, "cannot parse default modes\n");