XLibre/xf86-video-nv
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-nv.git synced 2026-03-24 01:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug #24787: Don't crash if LVDS initialization fails

Browse Source 
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
This commit is contained in:
Aaron Plattner
2010-03-08 16:49:24 -08:00
parent 71321d0dde
commit e6b0463294
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/g80_output.c
View File

@@ -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;
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);
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);
}
}
}
}