xf86-video-intel: src/i830_sdvo.c

Zhenyu Wang zhen at kemper.freedesktop.org
Mon Mar 2 22:25:21 PST 2009


 src/i830_sdvo.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 14bb61e0c2e28725a2f6167d3263649bc845be18
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Mon Mar 2 16:55:45 2009 +0800

    SDVO: only check digital monitor when EDID exists

diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c
index 4b98a9b..efdd691 100644
--- a/src/i830_sdvo.c
+++ b/src/i830_sdvo.c
@@ -1548,7 +1548,7 @@ i830_sdvo_detect(xf86OutputPtr output)
 	/* Check EDID in DVI-I case */
 	i830_sdvo_set_control_bus_switch(output, dev_priv->ddc_bus);
 	edid_mon = xf86OutputGetEDID (output, intel_output->pDDCBus);
-	if (!edid_mon || !DIGITAL(edid_mon->features.input_type)) {
+	if (edid_mon && !DIGITAL(edid_mon->features.input_type)) {
 	    xfree(edid_mon);
 	    return XF86OutputStatusDisconnected;
 	}


More information about the xorg-commit mailing list