Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / drivers / video / riva / rivafb-i2c.c

diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c
index 76e6ce3..a0e22ac 100644 (file)
--- 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;
 }