diff options
author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2013-06-12 16:27:28 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-06-28 08:14:19 -0400 |
commit | b2a1475561d59e8d182ba8cc4b7e78b662a3f533 (patch) | |
tree | 3a8db2a125855f443af31e633a7b0bb4c2fcf31e | |
parent | 15b1d171d87e86366266255462e6b11d21b61c1c (diff) |
drm/i915: check the return value of intel_dp_i2c_init
We've been ignoring this return value, so print a nice backtrace in
case it's not what we expected.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Zoltan Nyul <zoltan.nyul@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index ed1d34680125..591502c6f34c 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -3044,7 +3044,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, | |||
3044 | struct drm_i915_private *dev_priv = dev->dev_private; | 3044 | struct drm_i915_private *dev_priv = dev->dev_private; |
3045 | enum port port = intel_dig_port->port; | 3045 | enum port port = intel_dig_port->port; |
3046 | const char *name = NULL; | 3046 | const char *name = NULL; |
3047 | int type; | 3047 | int type, error; |
3048 | 3048 | ||
3049 | /* Preserve the current hw state. */ | 3049 | /* Preserve the current hw state. */ |
3050 | intel_dp->DP = I915_READ(intel_dp->output_reg); | 3050 | intel_dp->DP = I915_READ(intel_dp->output_reg); |
@@ -3142,7 +3142,9 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, | |||
3142 | BUG(); | 3142 | BUG(); |
3143 | } | 3143 | } |
3144 | 3144 | ||
3145 | intel_dp_i2c_init(intel_dp, intel_connector, name); | 3145 | error = intel_dp_i2c_init(intel_dp, intel_connector, name); |
3146 | WARN(error, "intel_dp_i2c_init failed with error %d for port %c\n", | ||
3147 | error, port_name(port)); | ||
3146 | 3148 | ||
3147 | if (!intel_edp_init_connector(intel_dp, intel_connector)) { | 3149 | if (!intel_edp_init_connector(intel_dp, intel_connector)) { |
3148 | i2c_del_adapter(&intel_dp->adapter); | 3150 | i2c_del_adapter(&intel_dp->adapter); |