diff options
| author | Petr Vandrovec <vandrove@vc.cvut.cz> | 2002-06-30 01:43:39 -0700 |
|---|---|---|
| committer | Petr Vandrovec <vandrove@vc.cvut.cz> | 2002-06-30 01:43:39 -0700 |
| commit | 485c916babffd4ef4dd4cba91e77b140cb524352 (patch) | |
| tree | 98e94730d53f17f36111c4df301a636281c450bc | |
| parent | 623568bf07832b0055d2c9b4ff4edb52dfaabf9f (diff) | |
[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.
| -rw-r--r-- | drivers/video/matrox/matroxfb_crtc2.c | 4 |
1 files 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; |