diff --git a/[refs] b/[refs]
index 0aa8f0a0a84c..731a62ef0c5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87fbaf6aea142b01756bbea09461daee41d93c0b
+refs/heads/master: 8546e3ce6e37c359979b69862442f94e0ef0e03b
diff --git a/trunk/drivers/video/atafb.c b/trunk/drivers/video/atafb.c
index 37624f74e88b..b7687c55fe16 100644
--- a/trunk/drivers/video/atafb.c
+++ b/trunk/drivers/video/atafb.c
@@ -2242,6 +2242,9 @@ static int ext_setcolreg(unsigned int regno, unsigned int red,
 	if (!external_vgaiobase)
 		return 1;
 
+	if (regno > 255)
+		return 1;
+
 	switch (external_card_type) {
 	case IS_VGA:
 		OUTB(0x3c8, regno);