All of lore.kernel.org
 help / color / mirror / Atom feed
From: weiyj_lk@163.com
To: Clemens Ladisch <clemens@ladisch.de>,
	Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>,
	Takashi Sakamoto <o-takashi@sakamocchi.jp>
Cc: Wei Yongjun <yongjun_wei@trendmicro.com.cn>,
	alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
Subject: [PATCH -next] ALSA: bebob: Fix missing unlock on error in special_clk_ctl_put()
Date: Sun, 20 Jul 2014 12:50:35 +0800	[thread overview]
Message-ID: <1405831835-26499-1-git-send-email-weiyj_lk@163.com> (raw)

From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Add the missing unlock before return from function special_clk_ctl_put()
in the error handling case.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
 sound/firewire/bebob/bebob_maudio.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sound/firewire/bebob/bebob_maudio.c b/sound/firewire/bebob/bebob_maudio.c
index 6af50eb..6748515 100644
--- a/sound/firewire/bebob/bebob_maudio.c
+++ b/sound/firewire/bebob/bebob_maudio.c
@@ -382,8 +382,10 @@ static int special_clk_ctl_put(struct snd_kcontrol *kctl,
 	mutex_lock(&bebob->mutex);
 
 	id = uval->value.enumerated.item[0];
-	if (id >= ARRAY_SIZE(special_clk_labels))
+	if (id >= ARRAY_SIZE(special_clk_labels)) {
+		mutex_unlock(&bebob->mutex);
 		return 0;
+	}
 
 	err = avc_maudio_set_special_clk(bebob, id,
 					 params->dig_in_fmt,


             reply	other threads:[~2014-07-20  4:51 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-20  4:50 weiyj_lk [this message]
2014-07-20  7:51 ` [PATCH -next] ALSA: bebob: Fix missing unlock on error in special_clk_ctl_put() Takashi Sakamoto
2014-07-21  2:09 ` [PATCH 0/6] bebob: Improvements for M-Audio specific operations Takashi Sakamoto
2014-07-21  2:10   ` [PATCH 1/6] bebob: Arrangement for critical section to be shorter Takashi Sakamoto
2014-07-21  2:10   ` [PATCH 2/6] bebob: Reducing function callers for simplicity Takashi Sakamoto
2014-07-21  2:10   ` [PATCH 3/6] bebob: Add dev_err() for debugging Takashi Sakamoto
2014-07-21 10:02     ` Takashi Iwai
2014-07-21  2:10   ` [PATCH 4/6] bebob: Use different labels for digital input/output interfaces Takashi Sakamoto
2014-07-21  9:58     ` Takashi Iwai
2014-07-21 10:49       ` Takashi Sakamoto
2014-07-21  2:10   ` [PATCH 5/6] bebob: Correction for return value of .put callback functions Takashi Sakamoto
2014-07-21  2:10   ` [PATCH 6/6] bebob: Arrangement for a control element to which two settings relate Takashi Sakamoto
2014-07-21  7:06   ` [PATCH 0/6] bebob: Improvements for M-Audio specific operations Takashi Iwai
2014-07-21  9:50     ` Takashi Sakamoto
2014-07-21  9:59       ` Takashi Iwai
2014-07-22 14:11 ` [PATCH 1/3] bebob: Fix a missing to unlock mutex in error handling case Takashi Sakamoto
2014-07-22 14:13   ` [PATCH 2/3] bebob: Use different labels for digital input/output Takashi Sakamoto
2014-07-22 14:13   ` [PATCH 3/3] bebob: Correction for return value of .put callback Takashi Sakamoto
2014-07-22 14:27     ` Takashi Sakamoto
2014-07-22 14:28       ` Takashi Iwai
2014-07-22 14:26   ` [PATCH 1/3] bebob: Fix a missing to unlock mutex in error handling case Takashi Iwai
2014-07-22 15:23     ` Takashi Sakamoto
2014-07-22 15:02   ` [PATCH] ALSA: bebob: Correction for return value of special_clk_ctl_put() in error Takashi Sakamoto
2014-07-22 15:37     ` Takashi Iwai

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=1405831835-26499-1-git-send-email-weiyj_lk@163.com \
    --to=weiyj_lk@163.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=clemens@ladisch.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=o-takashi@sakamocchi.jp \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.de \
    --cc=yongjun_wei@trendmicro.com.cn \
    /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.