diff options
| author |   Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-02-19 01:23:20 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-02-21 08:50:19 +0000 |
| commit | 78145b7a343fe2950478e649e905f557054df884 (patch) | |
| tree | e1e8bbeb9e78227ad2c5a25615683eddaa60d3e4 /drivers/video/via/viafbdev.c | |
| parent | viafb: NULL dereference on allocation failure in query_edid() (diff) | |
| download | linux-dev-78145b7a343fe2950478e649e905f557054df884.tar.xz linux-dev-78145b7a343fe2950478e649e905f557054df884.zip | |
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 <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video/via/viafbdev.c')
| -rw-r--r-- | drivers/video/via/viafbdev.c | 6 |
1 files changed, 4 insertions, 2 deletions
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"); } |