From: Alan Cox Date: Tue, 20 Dec 2011 15:58:29 +0000 (+0000) Subject: gma500: Oaktrail fixes X-Git-Tag: upstream/snapshot3+hdmi~8389^2~59 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5d3852dcabacc918f8c1428171513b6d618221fd;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git gma500: Oaktrail fixes The move to connectors breaks Oaktrail again if we have memory poisoning enabled. Fix this. Signed-off-by: Alan Cox Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma500/oaktrail_lvds.c index 965d47c..7dc892a 100644 --- a/drivers/gpu/drm/gma500/oaktrail_lvds.c +++ b/drivers/gpu/drm/gma500/oaktrail_lvds.c @@ -329,8 +329,7 @@ void oaktrail_lvds_init(struct drm_device *dev, struct psb_intel_connector *psb_intel_connector; struct drm_connector *connector; struct drm_encoder *encoder; - struct drm_psb_private *dev_priv = - (struct drm_psb_private *) dev->dev_private; + struct drm_psb_private *dev_priv = dev->dev_private; struct edid *edid; int ret = 0; struct i2c_adapter *i2c_adap; @@ -340,7 +339,7 @@ void oaktrail_lvds_init(struct drm_device *dev, if (!psb_intel_encoder) return; - psb_intel_connector = kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL); + psb_intel_connector = kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL); if (!psb_intel_connector) goto failed_connector;