mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	drm/i915: Drop the eDP check from intel_dp_connector_destroy()
As long as the connector was zeroed during allocation calling intel_panel_fini() is safe even if we haven't initialized the panel struct explicitly. So let's drop the useless eDP check from dp connector destruction. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20181008134641.24868-2-ville.syrjala@linux.intel.com Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
		
							parent
							
								
									19dfe5726b
								
							
						
					
					
						commit
						bc3213c444
					
				
					 1 changed files with 1 additions and 6 deletions
				
			
		| 
						 | 
					@ -5261,12 +5261,7 @@ intel_dp_connector_destroy(struct drm_connector *connector)
 | 
				
			||||||
	if (!IS_ERR_OR_NULL(intel_connector->edid))
 | 
						if (!IS_ERR_OR_NULL(intel_connector->edid))
 | 
				
			||||||
		kfree(intel_connector->edid);
 | 
							kfree(intel_connector->edid);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/*
 | 
						intel_panel_fini(&intel_connector->panel);
 | 
				
			||||||
	 * Can't call intel_dp_is_edp() since the encoder may have been
 | 
					 | 
				
			||||||
	 * destroyed already.
 | 
					 | 
				
			||||||
	 */
 | 
					 | 
				
			||||||
	if (connector->connector_type == DRM_MODE_CONNECTOR_eDP)
 | 
					 | 
				
			||||||
		intel_panel_fini(&intel_connector->panel);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
	drm_connector_cleanup(connector);
 | 
						drm_connector_cleanup(connector);
 | 
				
			||||||
	kfree(connector);
 | 
						kfree(connector);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue