From: Antti Palosaari <crope@iki.fi>
To: Luis Alves <ljalvs@gmail.com>, linux-media@vger.kernel.org
Cc: mkrufky@linuxtv.org, mchehab@infradead.org
Subject: Re: [PATCH] cx24117: Prevent mutex to be stuck on locked state if FE init fails.
Date: Fri, 04 Oct 2013 17:52:12 +0300 [thread overview]
Message-ID: <524ED61C.8040709@iki.fi> (raw)
In-Reply-To: <1380898115-30071-1-git-send-email-ljalvs@gmail.com>
On 04.10.2013 17:48, Luis Alves wrote:
> Hi,
> This patch will fix the situation where the mutex was left in a locked state if for some reason the FE init failed.
>
> Regards,
> Luis
>
>
> Signed-off-by: Luis Alves <ljalvs@gmail.com>
Reviewed-by: Antti Palosaari <crope@iki.fi>
> ---
> drivers/media/dvb-frontends/cx24117.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/media/dvb-frontends/cx24117.c b/drivers/media/dvb-frontends/cx24117.c
> index 9087309..476b422 100644
> --- a/drivers/media/dvb-frontends/cx24117.c
> +++ b/drivers/media/dvb-frontends/cx24117.c
> @@ -1238,11 +1238,11 @@ static int cx24117_initfe(struct dvb_frontend *fe)
> cmd.len = 3;
> ret = cx24117_cmd_execute_nolock(fe, &cmd);
> if (ret != 0)
> - return ret;
> + goto exit;
>
> ret = cx24117_diseqc_init(fe);
> if (ret != 0)
> - return ret;
> + goto exit;
>
> /* CMD 3C */
> cmd.args[0] = 0x3c;
> @@ -1252,7 +1252,7 @@ static int cx24117_initfe(struct dvb_frontend *fe)
> cmd.len = 4;
> ret = cx24117_cmd_execute_nolock(fe, &cmd);
> if (ret != 0)
> - return ret;
> + goto exit;
>
> /* CMD 34 */
> cmd.args[0] = 0x34;
> @@ -1260,9 +1260,8 @@ static int cx24117_initfe(struct dvb_frontend *fe)
> cmd.args[2] = CX24117_OCC;
> cmd.len = 3;
> ret = cx24117_cmd_execute_nolock(fe, &cmd);
> - if (ret != 0)
> - return ret;
>
> +exit:
> mutex_unlock(&state->priv->fe_lock);
>
> return ret;
>
--
http://palosaari.fi/
prev parent reply other threads:[~2013-10-04 14:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-04 14:48 [PATCH] cx24117: Prevent mutex to be stuck on locked state if FE init fails Luis Alves
2013-10-04 14:52 ` Antti Palosaari [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=524ED61C.8040709@iki.fi \
--to=crope@iki.fi \
--cc=linux-media@vger.kernel.org \
--cc=ljalvs@gmail.com \
--cc=mchehab@infradead.org \
--cc=mkrufky@linuxtv.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.