lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 250/265] drm/amdgpu/display: Unlock mutex on error
    Date
    From: John van der Kamp <sjonny@suffe.me.uk>

    commit ee434a4f9f5ea15b0f84bddd8c012838cf9472c5 upstream.

    Make sure we pass through ret label to unlock the mutex.

    Signed-off-by: John van der Kamp <sjonny@suffe.me.uk>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
    index dcf84a61de37f..949d10ef83040 100644
    --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
    +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
    @@ -510,8 +510,10 @@ static ssize_t srm_data_read(struct file *filp, struct kobject *kobj, struct bin

    srm = psp_get_srm(work->hdcp.config.psp.handle, &srm_version, &srm_size);

    - if (!srm)
    - return -EINVAL;
    + if (!srm) {
    + ret = -EINVAL;
    + goto ret;
    + }

    if (pos >= srm_size)
    ret = 0;
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-30 00:10    [W:4.213 / U:0.616 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site