---

yaml --- r: 345507 b: refs/heads/master c: 2aa4f09 h: refs/heads/master i: 345505: 69f8405 345503: 9e59b0f v: v3
git-mirror · Nov 22, 2012 · d919c1a · d919c1a
1 parent 713bd9a
commit d919c1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b745b1e54efa5154a06ed606ad82660773602b3
+refs/heads/master: 2aa4f09917d9854928074bb5bf1b9d8a9364a67f
diff --git a/trunk/drivers/gpu/drm/i915/intel_lvds.c b/trunk/drivers/gpu/drm/i915/intel_lvds.c
@@ -460,13 +460,8 @@ static int intel_lvds_get_modes(struct drm_connector *connector)
 	struct drm_display_mode *mode;
 
 	/* use cached edid if we have one */
-	if (lvds_connector->base.edid) {
-		/* invalid edid */
-		if (IS_ERR(lvds_connector->base.edid))
-			return 0;
-
+	if (!IS_ERR_OR_NULL(lvds_connector->base.edid))
 		return drm_add_edid_modes(connector, lvds_connector->base.edid);
-	}
 
 	mode = drm_mode_duplicate(dev, lvds_connector->base.panel.fixed_mode);
 	if (mode == NULL)