diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2010-03-08 16:49:24 -0800 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2010-03-08 16:50:54 -0800 |
| commit | e6b046329480a26ecebadf4314673db3f107f83e (patch) | |
| tree | 5103cb3a755508f6c2ec4e69e4de9dd9ed2812df | |
| parent | 71321d0ddecf1ab5327c754353d31db5d1f3c6bf (diff) | |
Bug #24787: Don't crash if LVDS initialization fails
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
| -rw-r--r-- | src/g80_output.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/g80_output.c b/src/g80_output.c index 887208b..5744d94 100644 --- a/src/g80_output.c +++ b/src/g80_output.c @@ -481,19 +481,22 @@ G80CreateOutputs(ScrnInfoPtr pScrn) if(pNv->lvds.present) { xf86OutputPtr lvds = G80CreateSor(pScrn, pNv->lvds.or, LVDS); - G80OutputPrivPtr pPriv = lvds->driver_private; - pPriv->scale = G80_SCALE_ASPECT; + if (lvds) { + G80OutputPrivPtr pPriv = lvds->driver_private; - if(pNv->lvds.i2cPort != -1) { - char i2cName[16]; + pPriv->scale = G80_SCALE_ASPECT; + + if(pNv->lvds.i2cPort != -1) { + char i2cName[16]; - snprintf(i2cName, sizeof(i2cName), "I2C%i (LVDS)", pNv->lvds.i2cPort); - pPriv->i2c = G80I2CInit(pScrn, i2cName, pNv->lvds.i2cPort); - if(!pPriv->i2c) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Failed to initialize I2C for port %i (LVDS)!\n", - pNv->lvds.i2cPort); + snprintf(i2cName, sizeof(i2cName), "I2C%i (LVDS)", pNv->lvds.i2cPort); + pPriv->i2c = G80I2CInit(pScrn, i2cName, pNv->lvds.i2cPort); + if(!pPriv->i2c) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Failed to initialize I2C for port %i (LVDS)!\n", + pNv->lvds.i2cPort); + } } } } |