From 878831251247f43ca2b2887f138ac2d8f2e815ec Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 29 Mar 2010 21:43:24 +0000
Subject: [PATCH] --- yaml --- r: 196430 b: refs/heads/master c:
 59d8aff6e4fc2705053e7ce2948b51f7fe507536 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/gpu/drm/drm_edid.c | 17 +++--------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 6f6611ed8656..9c206fde1f30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7466f4cc508878a8328dff1c328a2b4108888d2e
+refs/heads/master: 59d8aff6e4fc2705053e7ce2948b51f7fe507536
diff --git a/trunk/drivers/gpu/drm/drm_edid.c b/trunk/drivers/gpu/drm/drm_edid.c
index cf24ecab6a4a..9aa65b289d01 100644
--- a/trunk/drivers/gpu/drm/drm_edid.c
+++ b/trunk/drivers/gpu/drm/drm_edid.c
@@ -1328,31 +1328,20 @@ static int add_detailed_info_eedid(struct drm_connector *connector,
 	int start_offset, end_offset;
 	int timing_level;
 
-	if (edid->version == 1 && edid->revision < 3) {
-		/* If the EDID version is less than 1.3, there is no
-		 * extension EDID.
-		 */
+	if (edid->version == 1 && edid->revision < 3)
 		return 0;
-	}
-	if (!edid->extensions) {
-		/* if there is no extension EDID, it is unnecessary to
-		 * parse the E-EDID to get detailed info
-		 */
+	if (!edid->extensions)
 		return 0;
-	}
 
 	/* Find CEA extension */
 	for (i = 0; i < edid->extensions; i++) {
 		edid_ext = (char *)edid + EDID_LENGTH * (i + 1);
-		/* This block is CEA extension */
 		if (edid_ext[0] == 0x02)
 			break;
 	}
 
-	if (i == edid->extensions) {
-		/* if there is no additional timing EDID block, return */
+	if (i == edid->extensions)
 		return 0;
-	}
 
 	/* Get the start offset of detailed timing block */
 	start_offset = edid_ext[2];