From: Ville Syrjälä Date: Fri, 29 Nov 2013 11:21:49 +0000 (+0200) Subject: drm/i915: Fix port name in vlv_wait_port_ready() timeout warning X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=be46ffd48ba34189336c6fe420ff3370dcd36c60;p=~andy%2Flinux drm/i915: Fix port name in vlv_wait_port_ready() timeout warning We're currently misprinting the port name when vlv_wait_port_ready() times out. Fix it by using port_name(). Signed-off-by: Ville Syrjälä Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 5a79088e6da..0332d7ca892 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1513,7 +1513,7 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv, if (wait_for((I915_READ(DPLL(0)) & port_mask) == 0, 1000)) WARN(1, "timed out waiting for port %c ready: 0x%08x\n", - 'B' + dport->port, I915_READ(DPLL(0))); + port_name(dport->port), I915_READ(DPLL(0))); } /**