From 22913514dda2caaddbced2639fd3bd9d340d4354 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Sun, 7 Sep 2008 12:51:13 +0200 Subject: [PATCH] --- yaml --- r: 110995 b: refs/heads/master c: d8009882e9f5e1a76986c741f071edd2ad760c97 h: refs/heads/master i: 110993: b89dfa6ba6ce660d2995a449d48a45eed3128070 110991: 100b684e694a7a7d5bd6118cfe2ce874c0b02880 v: v3 --- [refs] | 2 +- trunk/sound/core/control.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7e468eb7f3f9..bf9b5a95f640 100644 --- 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 index 3c5e746d619b..6d71f9a7ccbb 100644 --- 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)