From 8e3010d7d8e8c49c8859b576de1808ae7b2859be Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 6 Jan 2016 08:54:47 -0500 Subject: xfree86: Remove a never-hit diagnostic message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Practically speaking, the EDID major version is never not 1. Reviewed-by: Michel Dänzer Signed-off-by: Adam Jackson --- hw/xfree86/ddc/ddcProperty.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c index e1b37db03..53446b8d6 100644 --- a/hw/xfree86/ddc/ddcProperty.c +++ b/hw/xfree86/ddc/ddcProperty.c @@ -76,17 +76,10 @@ addRootWindowProperties(ScrnInfoPtr pScrn, xf86MonPtr DDC) { int scrnIndex = pScrn->scrnIndex; - if (DDC->ver.version == 1) { - if (xf86Initialising) - edidMakeAtom(scrnIndex, EDID1_ATOM_NAME, DDC); - else - setRootWindowEDID(pScrn->pScreen, DDC); - } - else { - xf86DrvMsg(scrnIndex, X_PROBED, "unexpected EDID version %d.%d\n", - DDC->ver.version, DDC->ver.revision); - return; - } + if (xf86Initialising) + edidMakeAtom(scrnIndex, EDID1_ATOM_NAME, DDC); + else + setRootWindowEDID(pScrn->pScreen, DDC); } Bool -- cgit v1.2.3