diff --git a/[refs] b/[refs]
index 28db2deec01c..ea30e176e8ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91054598f794fb5d8a0b1e747ff8e2e8fc2115b3
+refs/heads/master: 82f5d57163abed2e5ff271d03217b6f90c616eb8
diff --git a/trunk/sound/pci/mixart/mixart.c b/trunk/sound/pci/mixart/mixart.c
index f23a73577c22..bb162507fe6c 100644
--- a/trunk/sound/pci/mixart/mixart.c
+++ b/trunk/sound/pci/mixart/mixart.c
@@ -607,6 +607,7 @@ static int snd_mixart_hw_params(struct snd_pcm_substream *subs,
 	/* set the format to the board */
 	err = mixart_set_format(stream, format);
 	if(err < 0) {
+		mutex_unlock(&mgr->setup_mutex);
 		return err;
 	}