---

yaml --- r: 157750 b: refs/heads/master c: 317b808 h: refs/heads/master v: v3
git-mirror · Aug 17, 2009 · bea6ffb · bea6ffb
1 parent b8b24a1
commit bea6ffb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a031aedf7f574a01eb725507cb303d4d7b8b23a
+refs/heads/master: 317b80817fcaeac7ae7e062fcccef0d2aba38a78
diff --git a/trunk/sound/core/control.c b/trunk/sound/core/control.c
@@ -433,15 +433,16 @@ static int snd_ctl_remove_unlocked_id(struct snd_ctl_file * file,
 	down_write(&card->controls_rwsem);
 	kctl = snd_ctl_find_id(card, id);
 	if (kctl == NULL) {
-		up_write(&card->controls_rwsem);
-		return -ENOENT;
+		ret = -ENOENT;
+		goto error;
 	}
 	for (idx = 0; idx < kctl->count; idx++)
 		if (kctl->vd[idx].owner != NULL && kctl->vd[idx].owner != file) {
-			up_write(&card->controls_rwsem);
-			return -EBUSY;
+			ret = -EBUSY;
+			goto error;
 		}
 	ret = snd_ctl_remove(card, kctl);
+error:
 	up_write(&card->controls_rwsem);
 	return ret;
 }