Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8009882 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

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: default avatarVegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 3d8cb466

sound/core/control.c

+2 −2
Original line number Diff line number Diff line
@@ -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)