]> err.no Git - linux-2.6/commitdiff
rivafb: Fix I2C getscl callback function
authorJean Delvare <khali@linux-fr.org>
Fri, 11 May 2007 05:23:28 +0000 (22:23 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 11 May 2007 15:29:37 +0000 (08:29 -0700)
Fix rivafb's I2C getscl callback function, as was done in nvidiafb recently.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/video/riva/rivafb-i2c.c

index 76e6ce353c8ea9c559d3668521ae184cd864eca6..a0e22ac483a3d65161f7e54bdfad322c8918d93c 100644 (file)
@@ -70,8 +70,6 @@ static int riva_gpio_getscl(void* data)
        if (VGA_RD08(par->riva.PCIO, 0x3d5) & 0x04)
                val = 1;
 
-       val = VGA_RD08(par->riva.PCIO, 0x3d5);
-
        return val;
 }