From: Paulo Zanoni Date: Fri, 10 Aug 2012 13:05:10 +0000 (-0300) Subject: drm/i915: use the correct encoder type when comparing X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~20^2~61^2~3 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=228d3e367c91af16d672fb8bff78b030acb5efc3;p=pandora-kernel.git drm/i915: use the correct encoder type when comparing - intel_encoder->type is INTEL_OUTPUT_SOMETHING - drm_encoder->encoder_type is DRM_MODE_ENCODER_SOMETHING Here we're using intel_encoder, so compare the oranges against oranges. While at it, rename the variable to "intel_encoder" so we keep our naming standards used everywhere. Luckily this was not a bug because both DRM_MODE_ENCODER_DAC and INTEL_OUTPUT_ANALOG are defined as 1. This is the only case where the drm definition matches the intel definition. Signed-off-by: Paulo Zanoni Reviewed-by: Jani Nikula Signed-off-by: Daniel Vetter --- Reading git-diff-tree failed