---

yaml --- r: 110995 b: refs/heads/master c: d800988 h: refs/heads/master i: 110993: b89dfa6 110991: 100b684 v: v3
git-mirror · Sep 9, 2008 · 2291351 · 2291351
1 parent d06d601
commit 2291351
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d8cb466a885cb5a0fb53ef3d39c36432d67fcbb
+refs/heads/master: d8009882e9f5e1a76986c741f071edd2ad760c97
diff --git a/trunk/sound/core/control.c b/trunk/sound/core/control.c
@@ -1438,12 +1438,12 @@ static int snd_ctl_dev_disconnect(struct snd_device *device)
 	if (snd_BUG_ON(cardnum < 0 || cardnum >= SNDRV_CARDS))
 		return -ENXIO;
 
-	down_read(&card->controls_rwsem);
+	read_lock(&card->ctl_files_rwlock);
 	list_for_each_entry(ctl, &card->ctl_files, list) {
 		wake_up(&ctl->change_sleep);
 		kill_fasync(&ctl->fasync, SIGIO, POLL_ERR);
 	}
-	up_read(&card->controls_rwsem);
+	read_unlock(&card->ctl_files_rwlock);
 
 	if ((err = snd_unregister_device(SNDRV_DEVICE_TYPE_CONTROL,
 					 card, -1)) < 0)