From 331d9d5958277de27e6ce42247e1cbec54fd1c7e Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Thu, 17 Dec 2009 14:15:09 +0100 Subject: Revert "fbdev: atafb - add palette register check" This reverts commit 8546e3ce6e37c359979b69862442f94e0ef0e03b, as it's a partial duplicate of commit 2f390380ca69e1617cdddb12d8da94f0a9f4319d ("fbdev: add palette register check to several drivers"). The former went in first through the m68k tree, the latter through Andrew Morton. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds --- drivers/video/atafb.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c index 2051c9dc813..b7687c55fe1 100644 --- a/drivers/video/atafb.c +++ b/drivers/video/atafb.c @@ -2245,9 +2245,6 @@ static int ext_setcolreg(unsigned int regno, unsigned int red, if (regno > 255) return 1; - if (regno > 255) - return 1; - switch (external_card_type) { case IS_VGA: OUTB(0x3c8, regno); -- cgit v1.2.3