xserver: Branch 'master'
Dave Airlie
airlied at kemper.freedesktop.org
Mon Dec 3 17:24:55 PST 2007
hw/xfree86/modes/xf86Crtc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 678f786715d76e972f8a77807c9caf3e90c24418
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Dec 4 12:24:47 2007 +1100
xf86crtc: oh mon could be NULL, so check before quirks
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index a237a4c..e00fdf3 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -2186,7 +2186,8 @@ xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus)
xf86MonPtr mon;
mon = xf86DoEDID_DDC2 (scrn->scrnIndex, pDDCBus);
- xf86DDCApplyQuirks (scrn->scrnIndex, mon);
+ if (mon)
+ xf86DDCApplyQuirks (scrn->scrnIndex, mon);
return mon;
}
More information about the xorg-commit
mailing list