diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-08-30 03:34:55 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-08-30 03:35:03 +0200 |
| commit | 49a51c4b4064c8a89ffd166434696138edef6b85 (patch) | |
| tree | 02e5fe85533c650b7cedc0633e7c5c533c60cece /drivers/gpu/drm/i915/intel_hdmi.c | |
| parent | Merge branch 'drm-fixes-4.19' of git://people.freedesktop.org/~agd5f/linux in... (diff) | |
| parent | drm/i915/audio: Hook up component bindings even if displays are disabled (diff) | |
| download | linux-49a51c4b4064c8a89ffd166434696138edef6b85.tar.xz linux-49a51c4b4064c8a89ffd166434696138edef6b85.zip | |
Merge tag 'drm-intel-fixes-2018-08-29' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
- fix for GLK and CNL watermark workaround
- fix for display affecting NUCs with LSPCON
- freeing an allocated write_buf on hdcp
- audio hook when display is disabled
- vma stop holding ppgtt reference
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180829234512.GA32468@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index a9076402dcb0..192972a7d287 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -943,8 +943,12 @@ static int intel_hdmi_hdcp_write(struct intel_digital_port *intel_dig_port, ret = i2c_transfer(adapter, &msg, 1); if (ret == 1) - return 0; - return ret >= 0 ? -EIO : ret; + ret = 0; + else if (ret >= 0) + ret = -EIO; + + kfree(write_buf); + return ret; } static |