---

yaml --- r: 329319 b: refs/heads/master c: f64c48f h: refs/heads/master i: 329317: 1ec47f8 329315: 37d93d3 329311: 5e0a5fc v: v3
git-mirror · Aug 24, 2012 · e54793e · e54793e
1 parent 0fad281
commit e54793e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce5fdd63752390b89804b1e246de267b398d1515
+refs/heads/master: f64c48f1d39cbe9e14dd25104633b486b1226606
diff --git a/trunk/drivers/gpu/drm/gma500/cdv_intel_dp.c b/trunk/drivers/gpu/drm/gma500/cdv_intel_dp.c
@@ -1554,7 +1554,6 @@ cdv_intel_dp_detect(struct drm_connector *connector, bool force)
 		edid = drm_get_edid(connector, &intel_dp->adapter);
 		if (edid) {
 			intel_dp->has_audio = drm_detect_monitor_audio(edid);
-			connector->display_info.raw_edid = NULL;
 			kfree(edid);
 		}
 	}
@@ -1634,8 +1633,6 @@ cdv_intel_dp_detect_audio(struct drm_connector *connector)
 	edid = drm_get_edid(connector, &intel_dp->adapter);
 	if (edid) {
 		has_audio = drm_detect_monitor_audio(edid);
-
-		connector->display_info.raw_edid = NULL;
 		kfree(edid);
 	}
 	if (edp)