2.4.13

 drivers

 video

diff -u --recursive --new-file v2.4.12/linux/drivers/video/cgsixfb.c linux/drivers/video/cgsixfb.c
--- v2.4.12/linux/drivers/video/cgsixfb.c   Sun Sep 23 11:41:00 2001
+++ linux/drivers/video/cgsixfb.c   Wed Oct 17 14:16:39 2001
@@ -1,4 +1,4 @@
-/* $Id: cgsixfb.c,v 1.25 2001/09/19 00:04:33 davem Exp $
+/* $Id: cgsixfb.c,v 1.26 2001/10/16 05:44:44 davem Exp $
  * cgsixfb.c: CGsix (GX,GXplus) frame buffer driver
  *
  * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz)
@@ -364,13 +364,15 @@
    unsigned long flags;
    int i, x, y;
    u8 *fd1, *fd2, *fd3, *fd4;
+   u16 c;
 
    spin_lock_irqsave(&fb->lock, flags);
    do {
       i = sbus_readl(&fbc->s);
    } while (i & 0x10000000);
-   sbus_writel(attr_fgcol(p, scr_readw(s)), &fbc->fg);
-   sbus_writel(attr_bgcol(p, scr_readw(s)), &fbc->bg);
+   c = scr_readw(s);
+   sbus_writel(attr_fgcol(p, c), &fbc->fg);
+   sbus_writel(attr_bgcol(p, c), &fbc->bg);
    sbus_writel(0x140000, &fbc->mode);
    sbus_writel(0xe880fc30, &fbc->alu);
    sbus_writel(~0, &fbc->pixelm);