diff options
| author | Alan Cox <alan@linux.intel.com> | 2011-12-20 15:58:29 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 15:50:08 +0000 |
| commit | 5d3852dcabacc918f8c1428171513b6d618221fd (patch) | |
| tree | 39b5f5734aea66aff595aa4f19a00db030942254 /drivers/gpu/drm/gma500 | |
| parent | 1fbe6f625f69e48c4001051dc1431afc704acfaa (diff) | |
| download | blackbird-op-linux-5d3852dcabacc918f8c1428171513b6d618221fd.tar.gz blackbird-op-linux-5d3852dcabacc918f8c1428171513b6d618221fd.zip | |
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/drm/gma500')
| -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 965d47cac0b5..7dc892ae7241 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; |
