aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2007-05-10 22:23:28 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-11 08:29:37 -0700
commit213b8a9af600316902e08e010fbcd216e42e41f7 (patch)
tree2f0ac1222b890fa08fc017308a306eca85e969a6
parent14340586148e7c88d7b1b752876f5b5227b200b9 (diff)
rivafb: Fix I2C getscl callback function
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>
-rw-r--r--drivers/video/riva/rivafb-i2c.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c
index 76e6ce353c8..a0e22ac483a 100644
--- a/drivers/video/riva/rivafb-i2c.c
+++ b/drivers/video/riva/rivafb-i2c.c
@@ -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;
}