From 485c916babffd4ef4dd4cba91e77b140cb524352 Mon Sep 17 00:00:00 2001 From: Petr Vandrovec Date: Sun, 30 Jun 2002 01:43:39 -0700 Subject: [PATCH] 2.5.24 matroxfb off by one error This fixes an off by one error in getcolreg/setcolreg in matroxfb's secondary head driver. --- drivers/video/matrox/matroxfb_crtc2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c index 1ec60bb05531..a26d8e56810d 100644 --- a/drivers/video/matrox/matroxfb_crtc2.c +++ b/drivers/video/matrox/matroxfb_crtc2.c @@ -29,7 +29,7 @@ MODULE_PARM_DESC(mem, "Memory size reserved for dualhead (default=8MB)"); static int matroxfb_dh_getcolreg(unsigned regno, unsigned *red, unsigned *green, unsigned *blue, unsigned *transp, struct fb_info* info) { #define m2info ((struct matroxfb_dh_fb_info*)info) - if (regno > 16) + if (regno >= 16) return 1; *red = m2info->palette[regno].red; *blue = m2info->palette[regno].blue; @@ -44,7 +44,7 @@ static int matroxfb_dh_setcolreg(unsigned regno, unsigned red, unsigned green, #define m2info ((struct matroxfb_dh_fb_info*)info) struct display* p; - if (regno > 16) + if (regno >= 16) return 1; m2info->palette[regno].red = red; m2info->palette[regno].blue = blue; -- cgit v1.2.3