]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ALSA: bebob: Fix a missing to unlock mutex in error handling case
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Tue, 22 Jul 2014 14:11:03 +0000 (23:11 +0900)
committerTakashi Iwai <tiwai@suse.de>
Tue, 22 Jul 2014 14:21:17 +0000 (16:21 +0200)
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 <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/firewire/bebob/bebob_maudio.c

index 6af50eb80ea7517680dbb7b18981eb9906fde5ae..fc470c60e433bf6ae0f0a88e06722eada5270dd3 100644 (file)
@@ -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,