From e2bef5663a42dd31f0e93435d995afcd1b7e1fff Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" Date: Thu, 8 Mar 2012 16:14:18 +0000 Subject: [PATCH] --- yaml --- r: 293713 b: refs/heads/master c: cc2e991c1564c952fd21f850db8d4a8f43847c09 h: refs/heads/master i: 293711: 025d5e8ba7886e317b591f4e4a3532e850ad226d v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/gma500/oaktrail_lvds.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f33f899166f5..f51e4b447f23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e30296a603812fc3592b2a25e0daf3b416d42ce +refs/heads/master: cc2e991c1564c952fd21f850db8d4a8f43847c09 diff --git a/trunk/drivers/gpu/drm/gma500/oaktrail_lvds.c b/trunk/drivers/gpu/drm/gma500/oaktrail_lvds.c index 37273b80bcd5..654f32b22b21 100644 --- a/trunk/drivers/gpu/drm/gma500/oaktrail_lvds.c +++ b/trunk/drivers/gpu/drm/gma500/oaktrail_lvds.c @@ -331,7 +331,6 @@ void oaktrail_lvds_init(struct drm_device *dev, struct drm_encoder *encoder; struct drm_psb_private *dev_priv = dev->dev_private; struct edid *edid; - int ret = 0; struct i2c_adapter *i2c_adap; struct drm_display_mode *scan; /* *modes, *bios_mode; */ @@ -400,7 +399,7 @@ void oaktrail_lvds_init(struct drm_device *dev, if (edid) { drm_mode_connector_update_edid_property(connector, edid); - ret = drm_add_edid_modes(connector, edid); + drm_add_edid_modes(connector, edid); kfree(edid); }