From 8708d67bf8e04b7b725bb6e748f06686909e75eb Mon Sep 17 00:00:00 2001
From: Antonino Daplas <adaplas@gmail.com>
Date: Tue, 5 Jun 2007 13:15:01 -0700
Subject: [PATCH] --- yaml --- r: 57384 b: refs/heads/master c:
 f2c138638687a7ffbf0d2a0e7addfec7bab9a765 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/video/sunxvr2500.c | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 4c6be0bf590d..5225c5bd3903 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2fa9e05e3876198d8ab31624fe84512a0a44b45
+refs/heads/master: f2c138638687a7ffbf0d2a0e7addfec7bab9a765
diff --git a/trunk/drivers/video/sunxvr2500.c b/trunk/drivers/video/sunxvr2500.c
index 4316c7fe8e21..c3869a96ab58 100644
--- a/trunk/drivers/video/sunxvr2500.c
+++ b/trunk/drivers/video/sunxvr2500.c
@@ -28,7 +28,7 @@ struct s3d_info {
 	unsigned int		depth;
 	unsigned int		fb_size;
 
-	u32			pseudo_palette[256];
+	u32			pseudo_palette[16];
 };
 
 static int __devinit s3d_get_props(struct s3d_info *sp)
@@ -52,15 +52,14 @@ static int s3d_setcolreg(unsigned regno,
 {
 	u32 value;
 
-	if (regno >= 256)
-		return 1;
+	if (regno < 16) {
+		red >>= 8;
+		green >>= 8;
+		blue >>= 8;
 
-	red >>= 8;
-	green >>= 8;
-	blue >>= 8;
-
-	value = (blue << 24) | (green << 16) | (red << 8);
-	((u32 *)info->pseudo_palette)[regno] = value;
+		value = (blue << 24) | (green << 16) | (red << 8);
+		((u32 *)info->pseudo_palette)[regno] = value;
+	}
 
 	return 0;
 }