diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-09-07 12:51:13 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-09-09 09:11:48 +0200 |
| commit | d8009882e9f5e1a76986c741f071edd2ad760c97 (patch) | |
| tree | 7af54716fe7c5201acb3c2670a3047b3c6a2d5c9 | |
| parent | 3d8cb466a885cb5a0fb53ef3d39c36432d67fcbb (diff) | |
ALSA: use correct lock in snd_ctl_dev_disconnect()
The lock used in snd_ctl_dev_disconnect() should be card->ctl_files_rwlock
for protection of card->ctl_files entries, instead of card->controls_rwsem.
Reported-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
| -rw-r--r-- | sound/core/control.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index 3c5e746d619b..6d71f9a7ccbb 100644 --- a/sound/core/control.c +++ b/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) |