Commit 5d3852dc authored by Alan Cox's avatar Alan Cox Committed by Dave Airlie

gma500: Oaktrail fixes

The move to connectors breaks Oaktrail again if we have memory poisoning
enabled. Fix this.
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 1fbe6f62
...@@ -329,8 +329,7 @@ void oaktrail_lvds_init(struct drm_device *dev, ...@@ -329,8 +329,7 @@ void oaktrail_lvds_init(struct drm_device *dev,
struct psb_intel_connector *psb_intel_connector; struct psb_intel_connector *psb_intel_connector;
struct drm_connector *connector; struct drm_connector *connector;
struct drm_encoder *encoder; struct drm_encoder *encoder;
struct drm_psb_private *dev_priv = struct drm_psb_private *dev_priv = dev->dev_private;
(struct drm_psb_private *) dev->dev_private;
struct edid *edid; struct edid *edid;
int ret = 0; int ret = 0;
struct i2c_adapter *i2c_adap; struct i2c_adapter *i2c_adap;
...@@ -340,7 +339,7 @@ void oaktrail_lvds_init(struct drm_device *dev, ...@@ -340,7 +339,7 @@ void oaktrail_lvds_init(struct drm_device *dev,
if (!psb_intel_encoder) if (!psb_intel_encoder)
return; 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) if (!psb_intel_connector)
goto failed_connector; goto failed_connector;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment