From d919c1a6858387f0c54a4c661e2fea1f8e2d8631 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 21 Nov 2012 16:14:04 +0000 Subject: [PATCH] --- yaml --- r: 345507 b: refs/heads/master c: 2aa4f09917d9854928074bb5bf1b9d8a9364a67f h: refs/heads/master i: 345505: 69f8405126f85e19c4615b231ea26c729a34703c 345503: 9e59b0fa0db50f0a1f58399e3e587ae4e29e2198 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_lvds.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 24966fcd9b6d..33d6df396ff9 100644 --- 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 index 506cfbdd6bab..2e266277f035 100644 --- 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)