From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753335AbZCLH3O (ORCPT ); Thu, 12 Mar 2009 03:29:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750835AbZCLH26 (ORCPT ); Thu, 12 Mar 2009 03:28:58 -0400 Received: from ns1.suse.de ([195.135.220.2]:54634 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750777AbZCLH25 (ORCPT ); Thu, 12 Mar 2009 03:28:57 -0400 Date: Thu, 12 Mar 2009 08:28:55 +0100 Message-ID: From: Takashi Iwai To: Jiri Slaby Cc: linux-kernel@vger.kernel.org, Jaroslav Kysela Subject: Re: [PATCH 1/2] sound: pcm_oss, fix locking typo In-Reply-To: <1236798701-14332-1-git-send-email-jirislaby@gmail.com> References: <1236798701-14332-1-git-send-email-jirislaby@gmail.com> User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 Emacs/22.3 (x86_64-suse-linux-gnu) MULE/5.0 (SAKAKI) 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 Wed, 11 Mar 2009 20:11:40 +0100, Jiri Slaby wrote: > > s/mutex_lock/mutex_unlock/ on 2 fail paths in snd_pcm_oss_proc_write. > Probably a typo, lock should be unlocked when leaving the function. > > Signed-off-by: Jiri Slaby Thanks, applied both patches now. Takashi > Cc: Jaroslav Kysela > Cc: Takashi Iwai > --- > sound/core/oss/pcm_oss.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c > index ddf83c8..dda000b 100644 > --- a/sound/core/oss/pcm_oss.c > +++ b/sound/core/oss/pcm_oss.c > @@ -2887,7 +2887,7 @@ static void snd_pcm_oss_proc_write(struct snd_info_entry *entry, > setup = kmalloc(sizeof(*setup), GFP_KERNEL); > if (! setup) { > buffer->error = -ENOMEM; > - mutex_lock(&pstr->oss.setup_mutex); > + mutex_unlock(&pstr->oss.setup_mutex); > return; > } > if (pstr->oss.setup_list == NULL) > @@ -2901,7 +2901,7 @@ static void snd_pcm_oss_proc_write(struct snd_info_entry *entry, > if (! template.task_name) { > kfree(setup); > buffer->error = -ENOMEM; > - mutex_lock(&pstr->oss.setup_mutex); > + mutex_unlock(&pstr->oss.setup_mutex); > return; > } > } > -- > 1.6.2 > caught by stanse >