matroxfb: color setting fixes

- the pseudo_palette is only 16 elements long.
- do not write to the pseudo_palette if regno (array index) is more than 15
- remove code that writes to the 17th entry of the pseudo_palette

Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Acked-by: Petr Vandrovec <vandrove@vc.cvut.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 2 insertions, 7 deletions

diff --git a/drivers/video/matrox/matroxfb_accel.c b/drivers/video/matrox/matroxfb_accel.c
index c57aaadf410c..209fe697ecc7 100644
--- a/drivers/video/matrox/matroxfb_accel.c
+++ b/drivers/video/matrox/matroxfb_accel.c
@@ -145,13 +145,10 @@ void matrox_cfbX_init(WPMINFO2) {
                                         ACCESS_FBINFO(fbops).fb_imageblit = matroxfb_imageblit;
                                 }
                                 break;
-                case 16:        if (ACCESS_FBINFO(fbcon).var.green.length == 5) {
+                case 16:        if (ACCESS_FBINFO(fbcon).var.green.length == 5)
                                         maccess = 0xC0000001;
-                                        ACCESS_FBINFO(cmap[16]) = 0x7FFF7FFF;
-                                } else {
+                                else
                                         maccess = 0x40000001;
-                                        ACCESS_FBINFO(cmap[16]) = 0xFFFFFFFF;
-                                }
                                 mopmode = M_OPMODE_16BPP;
                                 if (accel) {
                                         ACCESS_FBINFO(fbops).fb_copyarea = matroxfb_copyarea;
@@ -161,7 +158,6 @@ void matrox_cfbX_init(WPMINFO2) {
                                 break;
                 case 24:        maccess = 0x00000003;
                                 mopmode = M_OPMODE_24BPP;
-                                ACCESS_FBINFO(cmap[16]) = 0xFFFFFFFF;
                                 if (accel) {
                                         ACCESS_FBINFO(fbops).fb_copyarea = matroxfb_copyarea;
                                         ACCESS_FBINFO(fbops).fb_fillrect = matroxfb_fillrect;
@@ -170,7 +166,6 @@ void matrox_cfbX_init(WPMINFO2) {
                                 break;
                 case 32:        maccess = 0x00000002;
                                 mopmode = M_OPMODE_32BPP;
-                                ACCESS_FBINFO(cmap[16]) = 0xFFFFFFFF;
                                 if (accel) {
                                         ACCESS_FBINFO(fbops).fb_copyarea = matroxfb_copyarea;
                                         ACCESS_FBINFO(fbops).fb_fillrect = matroxfb_fillrect;