Revert "fbdev: atafb - add palette register check"
authorGeert Uytterhoeven <geert@linux-m68k.org>
Thu, 17 Dec 2009 13:15:09 +0000 (14:15 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Dec 2009 15:20:30 +0000 (07:20 -0800)
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 <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/video/atafb.c

index 2051c9d..b7687c5 100644 (file)
@@ -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);