gma500: Oaktrail fixes
authorAlan Cox <alan@linux.intel.com>
Tue, 20 Dec 2011 15:58:29 +0000 (15:58 +0000)
committerDave Airlie <airlied@redhat.com>
Tue, 20 Dec 2011 15:50:08 +0000 (15:50 +0000)
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>
drivers/gpu/drm/gma500/oaktrail_lvds.c

index 965d47cac0b5a55010c2cc26bb713691f790c71c..7dc892ae7241d8cfb27e13995d6189a4ab31e23d 100644 (file)
@@ -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;