]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ALSA: pcm_oss, fix locking typo
authorJiri Slaby <jirislaby@gmail.com>
Wed, 11 Mar 2009 19:11:40 +0000 (20:11 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 23 Mar 2009 21:59:58 +0000 (14:59 -0700)
commit 91054598f794fb5d8a0b1e747ff8e2e8fc2115b3 upstream.

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 <jirislaby@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
sound/core/oss/pcm_oss.c

index 4c601b192ddf3feb4117186d230a73f4538f1723..35afb418e4df0c6218f3587c77a8ee2247b88f74 100644 (file)
@@ -2854,7 +2854,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)
@@ -2868,7 +2868,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;
                        }
                }