Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755242AbaGVO0z (ORCPT ); Tue, 22 Jul 2014 10:26:55 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46471 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751090AbaGVO0x (ORCPT ); Tue, 22 Jul 2014 10:26:53 -0400 Date: Tue, 22 Jul 2014 16:26:50 +0200 Message-ID: From: Takashi Iwai To: Takashi Sakamoto Cc: clemens@ladisch.de, perex@perex.cz, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, darrena092@gmail.com, weiyj_lk@163.com Subject: Re: [PATCH 1/3] bebob: Fix a missing to unlock mutex in error handling case In-Reply-To: <1406038263-18558-1-git-send-email-o-takashi@sakamocchi.jp> References: <1405831835-26499-1-git-send-email-weiyj_lk@163.com> <1406038263-18558-1-git-send-email-o-takashi@sakamocchi.jp> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Tue, 22 Jul 2014 23:11:03 +0900, Takashi Sakamoto wrote: > > In error handling case, special_clk_ctl_put() returns without unlock_mutex(), > therefore the mutex is still locked. This commit moves mutex_lock() after > the error handling case. > > This commit is my solution for this post. > > [PATCH -next] ALSA: bebob: Fix missing unlock on error in special_clk_ctl_put() > https://lkml.org/lkml/2014/7/20/12 > > Signed-off-by: Takashi Sakamoto Thanks, applied all three patches now. BTW, at the next time, put "v2" or such in the subject line so that people can distinguish the new patch series from the previous ones. You can use --subject-prefix option for git-format-patch or else. Preferably, write the changes since the previous revision, too (usually below the --- line, so that it's not merged into the git changelog; some people like to have them in the final commit, though.) Last but not least, don't forget to put a proper subject prefix. For ALSA codes, we put "ALSA:" prefix in the subject. Study git changelogs. Takashi > --- > sound/firewire/bebob/bebob_maudio.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/firewire/bebob/bebob_maudio.c b/sound/firewire/bebob/bebob_maudio.c > index 6af50eb..fc470c6 100644 > --- a/sound/firewire/bebob/bebob_maudio.c > +++ b/sound/firewire/bebob/bebob_maudio.c > @@ -379,12 +379,12 @@ static int special_clk_ctl_put(struct snd_kcontrol *kctl, > struct special_params *params = bebob->maudio_special_quirk; > int err, id; > > - mutex_lock(&bebob->mutex); > - > id = uval->value.enumerated.item[0]; > if (id >= ARRAY_SIZE(special_clk_labels)) > return 0; > > + mutex_lock(&bebob->mutex); > + > err = avc_maudio_set_special_clk(bebob, id, > params->dig_in_fmt, > params->dig_out_fmt, > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/