Merge branches 'release', 'acpica', 'bugzilla-10224', 'bugzilla-9772', 'bugzilla...

[karo-tx-linux.git] / drivers / video / riva / rivafb-i2c.c

diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c
index bcb209670a182de4f448364ef1935df7e40a33cd..a0e22ac483a3d65161f7e54bdfad322c8918d93c 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;
 }
 
@@ -133,11 +131,11 @@ void __devinit riva_create_i2c_busses(struct riva_par *par)
        par->chan[1].par        = par;
        par->chan[2].par        = par;
 
-       par->chan[0].ddc_base = 0x3e;
-       par->chan[1].ddc_base = 0x36;
+       par->chan[0].ddc_base = 0x36;
+       par->chan[1].ddc_base = 0x3e;
        par->chan[2].ddc_base = 0x50;
-       riva_setup_i2c_bus(&par->chan[0], "BUS1", 0);
-       riva_setup_i2c_bus(&par->chan[1], "BUS2", I2C_CLASS_HWMON);
+       riva_setup_i2c_bus(&par->chan[0], "BUS1", I2C_CLASS_HWMON);
+       riva_setup_i2c_bus(&par->chan[1], "BUS2", 0);
        riva_setup_i2c_bus(&par->chan[2], "BUS3", 0);
 }