omapfb: remove wrong scale call for gfx_plane

[linux-2.6-omap-h63xx.git] / drivers / video / omap / omapfb_main.c

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;
 }
 
 /*