From: Jean Delvare <khali@linux-fr.org>
Date: Fri, 11 May 2007 05:23:28 +0000 (-0700)
Subject: rivafb: Fix I2C getscl callback function
X-Git-Tag: v2.6.22-rc1~40
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=213b8a9af600316902e08e010fbcd216e42e41f7;p=linux-2.6

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>
---

diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c
index 76e6ce353c..a0e22ac483 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;
 }