From b005953aa5b03033250e023f534f5c814af5f9fc Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 20 Dec 2011 15:58:29 +0000 Subject: [PATCH] --- yaml --- r: 282525 b: refs/heads/master c: 5d3852dcabacc918f8c1428171513b6d618221fd h: refs/heads/master i: 282523: 27c3ab1e38fc7279dbd659f25c2ded59ae576a30 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/gma500/oaktrail_lvds.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1a7d0c9d6966..52520ab3c005 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1fbe6f625f69e48c4001051dc1431afc704acfaa +refs/heads/master: 5d3852dcabacc918f8c1428171513b6d618221fd diff --git a/trunk/drivers/gpu/drm/gma500/oaktrail_lvds.c b/trunk/drivers/gpu/drm/gma500/oaktrail_lvds.c index 965d47cac0b5..7dc892ae7241 100644 --- a/trunk/drivers/gpu/drm/gma500/oaktrail_lvds.c +++ b/trunk/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;