1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index 2c4f470fa086..8ce60e1b220a 100644
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -486,10 +486,11 @@ static int set_color_mode(struct omapfb_plane_struct *plane,
                 return 0;
         case 12:
                 var->bits_per_pixel = 16;
-                plane->color_mode = OMAPFB_COLOR_RGB444;
-                return 0;
         case 16:
-                plane->color_mode = OMAPFB_COLOR_RGB565;
+                if (plane->fbdev->panel->bpp == 12)
+                        plane->color_mode = OMAPFB_COLOR_RGB444;
+                else
+                        plane->color_mode = OMAPFB_COLOR_RGB565;
                 return 0;
         default:
                 return -EINVAL;