From 78145b7a343fe2950478e649e905f557054df884 Mon Sep 17 00:00:00 2001 From: Florian Tobias Schandinat Date: Sun, 19 Feb 2012 01:23:20 +0000 Subject: viafb: another workaround for OLPCs weird wiring On OLPC we must not touch this I2C bus or it will hang. Signed-off-by: Florian Tobias Schandinat --- drivers/video/via/viafbdev.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'drivers/video/via/viafbdev.c') diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c index 47911658f684..9cfa92ef6bd0 100644 --- a/drivers/video/via/viafbdev.c +++ b/drivers/video/via/viafbdev.c @@ -1752,8 +1752,10 @@ static void __devinit i2c_bus_probe(struct viafb_shared *shared) shared->i2c_31 = via_aux_probe(viafb_find_i2c_adapter(VIA_PORT_31)); /* FIXME: what is this? */ - printk(KERN_INFO "viafb: Probing I2C bus 0x2C\n"); - shared->i2c_2C = via_aux_probe(viafb_find_i2c_adapter(VIA_PORT_2C)); + if (!machine_is_olpc()) { + printk(KERN_INFO "viafb: Probing I2C bus 0x2C\n"); + shared->i2c_2C = via_aux_probe(viafb_find_i2c_adapter(VIA_PORT_2C)); + } printk(KERN_INFO "viafb: Finished I2C bus probing"); } -- cgit v1.2.3-59-g8ed1b