OMAPDSS: OMAPFB : Dont error if default display is ON

Dont error if default display state is already ON.

Change-Id: I25120083613f5e0ef0e2fea7a5fd26182e1e4b7e
Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>

diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index d0b1ff18351d49378c1fa62972d585d9416030c2..32eb09212df34d1371412dab22fb7d8fe6226fac 100644 (file)
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2479,11 +2479,14 @@ static int omapfb_init_display(struct omapfb2_device *fbdev,
        struct omapfb_display_data *d;
        int r;
 
-       r = dssdrv->enable(dssdev);
-       if (r) {
-               dev_warn(fbdev->dev, "Failed to enable display '%s'\n",
-                               dssdev->name);
-               return r;
+       if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {
+
+               r = dssdrv->enable(dssdev);
+               if (r) {
+                       dev_warn(fbdev->dev, "Failed to enable display '%s'\n",
+                                       dssdev->name);
+                       return r;
+               }
        }
 
        d = get_display_data(fbdev, dssdev);