diff options
author | Alan Cox <alan@linux.intel.com> | 2011-12-20 10:58:29 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 10:50:08 -0500 |
commit | 5d3852dcabacc918f8c1428171513b6d618221fd (patch) | |
tree | 39b5f5734aea66aff595aa4f19a00db030942254 /drivers/gpu | |
parent | 1fbe6f625f69e48c4001051dc1431afc704acfaa (diff) |
gma500: Oaktrail fixes
The move to connectors breaks Oaktrail again if we have memory poisoning
enabled. Fix this.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/gma500/oaktrail_lvds.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma500/oaktrail_lvds.c index 965d47cac0b..7dc892ae724 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, | |||
329 | struct psb_intel_connector *psb_intel_connector; | 329 | struct psb_intel_connector *psb_intel_connector; |
330 | struct drm_connector *connector; | 330 | struct drm_connector *connector; |
331 | struct drm_encoder *encoder; | 331 | struct drm_encoder *encoder; |
332 | struct drm_psb_private *dev_priv = | 332 | struct drm_psb_private *dev_priv = dev->dev_private; |
333 | (struct drm_psb_private *) dev->dev_private; | ||
334 | struct edid *edid; | 333 | struct edid *edid; |
335 | int ret = 0; | 334 | int ret = 0; |
336 | struct i2c_adapter *i2c_adap; | 335 | struct i2c_adapter *i2c_adap; |
@@ -340,7 +339,7 @@ void oaktrail_lvds_init(struct drm_device *dev, | |||
340 | if (!psb_intel_encoder) | 339 | if (!psb_intel_encoder) |
341 | return; | 340 | return; |
342 | 341 | ||
343 | psb_intel_connector = kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL); | 342 | psb_intel_connector = kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL); |
344 | if (!psb_intel_connector) | 343 | if (!psb_intel_connector) |
345 | goto failed_connector; | 344 | goto failed_connector; |
346 | 345 | ||