From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 28 Sep 2010 14:48:38 +0000 (+0100)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Tag: v2.6.37-rc1~92^2~28^2~25
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e0e41598b433c0216814d54c62e7c1834f464d9b;p=~emulex%2Finfiniband.git

Merge branch 'drm-intel-fixes' into drm-intel-next
---

e0e41598b433c0216814d54c62e7c1834f464d9b
diff --cc drivers/gpu/drm/i915/intel_sdvo.c
index b684a405a05,ee73e428a84..a84224f3760
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@@ -2134,30 -2148,29 +2134,29 @@@ intel_sdvo_tv_init(struct intel_sdvo *i
  		return false;
  
  	intel_connector = &intel_sdvo_connector->base;
 -        connector = &intel_connector->base;
 -        encoder->encoder_type = DRM_MODE_ENCODER_TVDAC;
 -        connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO;
 +	connector = &intel_connector->base;
 +	encoder->encoder_type = DRM_MODE_ENCODER_TVDAC;
 +	connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO;
  
 -        intel_sdvo->controlled_output |= type;
 -        intel_sdvo_connector->output_flag = type;
 +	intel_sdvo->controlled_output |= type;
 +	intel_sdvo_connector->output_flag = type;
  
 -        intel_sdvo->is_tv = true;
 -        intel_sdvo->base.needs_tv_clock = true;
 -        intel_sdvo->base.clone_mask = 1 << INTEL_SDVO_TV_CLONE_BIT;
 +	intel_sdvo->is_tv = true;
 +	intel_sdvo->base.needs_tv_clock = true;
 +	intel_sdvo->base.clone_mask = 1 << INTEL_SDVO_TV_CLONE_BIT;
  
 -        intel_sdvo_connector_init(encoder, connector);
 +	intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo);
  
 -        if (!intel_sdvo_tv_create_property(intel_sdvo, intel_sdvo_connector, type))
 +	if (!intel_sdvo_tv_create_property(intel_sdvo, intel_sdvo_connector, type))
  		goto err;
  
 -        if (!intel_sdvo_create_enhance_property(intel_sdvo, intel_sdvo_connector))
 +	if (!intel_sdvo_create_enhance_property(intel_sdvo, intel_sdvo_connector))
  		goto err;
  
 -        return true;
 +	return true;
  
  err:
- 	intel_sdvo_destroy_enhance_property(connector);
- 	kfree(intel_sdvo_connector);
+ 	intel_sdvo_destroy(connector);
  	return false;
  }