[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20111220155820.11629.86054.stgit@bob.linux.org.uk>
Date: Tue, 20 Dec 2011 15:58:29 +0000
From: Alan Cox <alan@...rguk.ukuu.org.uk>
To: airlied@...ux.ie, linux-kernel@...r.kernel.org
Subject: [PATCH 1/2] gma500: Oaktrail fixes
From: Alan Cox <alan@...ux.intel.com>
The move to connectors breaks Oaktrail again if we have memory poisoning
enabled. Fix this.
Signed-off-by: Alan Cox <alan@...ux.intel.com>
---
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 965d47c..7dc892a 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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists