From: Alex Deucher <alexdeucher@gmail.com>
To: John van der Kamp <sjonny@suffe.me.uk>
Cc: amd-gfx list <amd-gfx@lists.freedesktop.org>
Subject: Re: [PATCH] Unlock mutex on error
Date: Tue, 23 Jun 2020 17:48:16 -0400 [thread overview]
Message-ID: <CADnq5_Ncs3V8TBvNjczODd0M4OqiBZNnGN6CSUowo-_5WCikdg@mail.gmail.com> (raw)
In-Reply-To: <20200623213054.8847-1-sjonny@suffe.me.uk>
Applied. Thanks!
Alex
On Tue, Jun 23, 2020 at 5:33 PM John van der Kamp <sjonny@suffe.me.uk> wrote:
>
> Make sure we pass through ret label to unlock the mutex.
>
> Signed-off-by: John van der Kamp <sjonny@suffe.me.uk>
> ---
> 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 dcf84a61de37..949d10ef8304 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.20.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
prev parent reply other threads:[~2020-06-23 21:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 21:30 [PATCH] Unlock mutex on error John van der Kamp
2020-06-23 21:48 ` Alex Deucher [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CADnq5_Ncs3V8TBvNjczODd0M4OqiBZNnGN6CSUowo-_5WCikdg@mail.gmail.com \
--to=alexdeucher@gmail.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=sjonny@suffe.me.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).