omapfb: remove wrong scale call for gfx_plane

The gfx_plane doesn't support scaling.

Signed-off-by: Arun C <arunedarath@mistralsolutions.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
index 82ba030a915711273b03492acb96676ca1f54925..ce4c4debb7fa1f4e9280c7daec3ac21ab03ead2a 100644 (file)
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -519,8 +519,7 @@ static int omap_dispc_set_scale(int plane,
        if ((unsigned)plane > OMAPFB_PLANE_NUM)
                return -ENODEV;
 
-       if (plane == OMAPFB_PLANE_GFX &&
-           (out_width != orig_width || out_height != orig_height))
+       if (out_width != orig_width || out_height != orig_height)
                return -EINVAL;
 
        enable_lcd_clocks(1);

diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index 1ffe74c126d6e7ae34f719fff4876140fdabca9d..d176a2cf7aaf7c014b8597fb4593c7c014d6348d 100644 (file)
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -223,13 +223,15 @@ static int ctrl_change_mode(struct fb_info *fbi)
                if((r = fbdev->ctrl->set_rotate(var->rotate)) < 0)
                        return r;
 
-       if (fbdev->ctrl->set_scale != NULL)
+       if ((fbdev->ctrl->set_scale != NULL) && (plane->idx > 0))
                r = fbdev->ctrl->set_scale(plane->idx,
                                   var->xres, var->yres,
                                   plane->info.out_width,
                                   plane->info.out_height);
+       if (r < 0)
+               return r;
 
-       return r;
+       return 0;
 }
 
 /*