lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gma500: Oaktrail fixes

Browse Source 
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>
This commit is contained in:
Alan Cox
2011-12-20 15:58:29 +00:00
committed by Dave Airlie
parent 1fbe6f625f
commit 5d3852dcab
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/gma500/oaktrail_lvds.c
View File

@@ -329,8 +329,7 @@ void oaktrail_lvds_init(struct drm_device *dev,
struct psb_intel_connector *psb_intel_connector; struct psb_intel_connector *psb_intel_connector;
struct drm_connector *connector; struct drm_connector *connector;
struct drm_encoder *encoder; struct drm_encoder *encoder;
struct drm_psb_private *dev_priv = struct drm_psb_private *dev_priv = dev->dev_private;
(struct drm_psb_private *) dev->dev_private;
struct edid *edid; struct edid *edid;
int ret = 0; int ret = 0;
struct i2c_adapter *i2c_adap; struct i2c_adapter *i2c_adap;
@@ -340,7 +339,7 @@ void oaktrail_lvds_init(struct drm_device *dev,
if (!psb_intel_encoder) if (!psb_intel_encoder)
return; 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) if (!psb_intel_connector)
goto failed_connector; goto failed_connector;