diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /drivers/video/aty/radeon_base.c | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/video/aty/radeon_base.c')
| -rw-r--r-- | drivers/video/aty/radeon_base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index c9f0c5a07e6e..9a6b5b39b88e 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
| @@ -1067,7 +1067,7 @@ static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green, | |||
| 1067 | 1067 | ||
| 1068 | 1068 | ||
| 1069 | if (regno > 255) | 1069 | if (regno > 255) |
| 1070 | return 1; | 1070 | return -EINVAL; |
| 1071 | 1071 | ||
| 1072 | red >>= 8; | 1072 | red >>= 8; |
| 1073 | green >>= 8; | 1073 | green >>= 8; |
| @@ -1086,9 +1086,9 @@ static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green, | |||
| 1086 | pindex = regno * 8; | 1086 | pindex = regno * 8; |
| 1087 | 1087 | ||
| 1088 | if (rinfo->depth == 16 && regno > 63) | 1088 | if (rinfo->depth == 16 && regno > 63) |
| 1089 | return 1; | 1089 | return -EINVAL; |
| 1090 | if (rinfo->depth == 15 && regno > 31) | 1090 | if (rinfo->depth == 15 && regno > 31) |
| 1091 | return 1; | 1091 | return -EINVAL; |
| 1092 | 1092 | ||
| 1093 | /* For 565, the green component is mixed one order | 1093 | /* For 565, the green component is mixed one order |
| 1094 | * below | 1094 | * below |