drm/i915/dp: Fix compilation of intel_dp_hdcp_check_link
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 18 Jan 2018 16:10:25 +0000 (16:10 +0000)
committerSean Paul <seanpaul@chromium.org>
Thu, 18 Jan 2018 16:57:13 +0000 (11:57 -0500)
drivers/gpu/drm/i915/intel_dp.c: In function ‘intel_dp_hdcp_check_link’:
drivers/gpu/drm/i915/intel_dp.c:5191:26: error: ?: using integer constants in boolean context [-Werror=int-in-bool-context]
   return ret >= 0 ? -EIO : ret;

Fixes: 20f24d776d1b ("drm/i915: Implement HDCP for DisplayPort")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ramalingam C <ramalingam.c@intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20180118161025.22700-1-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/intel_dp.c

index 68229f53d5b8a6e0b8d13735f8cdd7321e61a1da..0f2290c7bede18402e01f90d662887670155b1f2 100644 (file)
@@ -5184,12 +5184,14 @@ bool intel_dp_hdcp_check_link(struct intel_digital_port *intel_dig_port)
 {
        ssize_t ret;
        u8 bstatus;
+
        ret = drm_dp_dpcd_read(&intel_dig_port->dp.aux, DP_AUX_HDCP_BSTATUS,
                               &bstatus, 1);
        if (ret != 1) {
                DRM_ERROR("Read bstatus from DP/AUX failed (%zd)\n", ret);
-               return ret >= 0 ? -EIO : ret;
+               return false;
        }
+
        return !(bstatus & (DP_BSTATUS_LINK_FAILURE | DP_BSTATUS_REAUTH_REQ));
 }