summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorJon Smirl <jonsmirl@yahoo.com>2004-10-19 16:30:02 +0000
committerJon Smirl <jonsmirl@yahoo.com>2004-10-19 16:30:02 +0000
commitbcfbd73536e8e44b028953e4e04c83d143612a10 (patch)
tree9960ab33c1c604bfc8a1ff820b2d5658f950fffd /linux-core
parentca1ec9268f9de783daf3f2db86a4fb47108d609a (diff)
Fix missing I2C busses to be non-fatal error.
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/radeon_i2c.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/linux-core/radeon_i2c.c b/linux-core/radeon_i2c.c
index bd35f17f..97770caa 100644
--- a/linux-core/radeon_i2c.c
+++ b/linux-core/radeon_i2c.c
@@ -116,27 +116,25 @@ static int setup_i2c_bus(struct radeon_i2c_chan *chan, const char *name)
int radeon_create_i2c_busses(drm_device_t * dev)
{
drm_radeon_private_t *dev_priv = dev->dev_private;
- int ret;
dev_priv->i2c[0].dev = dev;
dev_priv->i2c[0].ddc_reg = GPIO_MONID;
- if ((ret = setup_i2c_bus(&dev_priv->i2c[0], "monid")))
- return ret;
+ /* Don't return the error from setup. It is not fatal */
+ /* if the bus can not be initialized */
+ setup_i2c_bus(&dev_priv->i2c[0], "monid");
dev_priv->i2c[1].dev = dev;
dev_priv->i2c[1].ddc_reg = GPIO_DVI_DDC;
- if ((ret = setup_i2c_bus(&dev_priv->i2c[1], "dvi")))
- return ret;
+ setup_i2c_bus(&dev_priv->i2c[1], "dvi");
dev_priv->i2c[2].dev = dev;
dev_priv->i2c[2].ddc_reg = GPIO_VGA_DDC;
- if ((ret = setup_i2c_bus(&dev_priv->i2c[2], "vga")))
- return ret;
+ setup_i2c_bus(&dev_priv->i2c[2], "vga");
dev_priv->i2c[3].dev = dev;
dev_priv->i2c[3].ddc_reg = GPIO_CRT2_DDC;
- if ((ret = setup_i2c_bus(&dev_priv->i2c[3], "crt2")))
- return ret;
+ setup_i2c_bus(&dev_priv->i2c[3], "crt2");
+
return 0;
}