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

Commit 0914f796 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: Avoid endless sleep after disconnect 



When disconnect callback is called, each component should wake up
sleepers and check card->shutdown flag for avoiding the endless sleep
blocking the proper resource release.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a0830dbd

sound/core/control.c

+2 −0
Original line number Diff line number Diff line
@@ -1437,6 +1437,8 @@ static ssize_t snd_ctl_read(struct file *file, char __user *buffer, 
			spin_unlock_irq(&ctl->read_lock);

			schedule();

			remove_wait_queue(&ctl->change_sleep, &wait);

			if (ctl->card->shutdown)

				return -ENODEV;

			if (signal_pending(current))

				return -ERESTARTSYS;

			spin_lock_irq(&ctl->read_lock);

sound/core/hwdep.c

+7 −0
Original line number Diff line number Diff line
@@ -131,6 +131,10 @@ static int snd_hwdep_open(struct inode *inode, struct file * file) 
		mutex_unlock(&hw->open_mutex);

		schedule();

		mutex_lock(&hw->open_mutex);

		if (hw->card->shutdown) {

			err = -ENODEV;

			break;

		}

		if (signal_pending(current)) {

			err = -ERESTARTSYS;

			break;
@@ -462,12 +466,15 @@ static int snd_hwdep_dev_disconnect(struct snd_device *device) 
		mutex_unlock(&register_mutex);

		return -EINVAL;

	}

	mutex_lock(&hwdep->open_mutex);

	wake_up(&hwdep->open_wait);

#ifdef CONFIG_SND_OSSEMUL

	if (hwdep->ossreg)

		snd_unregister_oss_device(hwdep->oss_type, hwdep->card, hwdep->device);

#endif

	snd_unregister_device(SNDRV_DEVICE_TYPE_HWDEP, hwdep->card, hwdep->device);

	list_del_init(&hwdep->list);

	mutex_unlock(&hwdep->open_mutex);

	mutex_unlock(&register_mutex);

	return 0;

}

sound/core/oss/pcm_oss.c

+4 −0
Original line number Diff line number Diff line
@@ -2441,6 +2441,10 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file) 
		mutex_unlock(&pcm->open_mutex);

		schedule();

		mutex_lock(&pcm->open_mutex);

		if (pcm->card->shutdown) {

			err = -ENODEV;

			break;

		}

		if (signal_pending(current)) {

			err = -ERESTARTSYS;

			break;

sound/core/pcm.c

+5 −1
Original line number Diff line number Diff line
@@ -1087,12 +1087,16 @@ static int snd_pcm_dev_disconnect(struct snd_device *device) 
		goto unlock;



	mutex_lock(&pcm->open_mutex);

	wake_up(&pcm->open_wait);

	list_del_init(&pcm->list);

	for (cidx = 0; cidx < 2; cidx++)

		for (substream = pcm->streams[cidx].substream; substream; substream = substream->next) {

			snd_pcm_stream_lock_irq(substream);

			if (substream->runtime)

			if (substream->runtime) {

				substream->runtime->status->state = SNDRV_PCM_STATE_DISCONNECTED;

				wake_up(&substream->runtime->sleep);

				wake_up(&substream->runtime->tsleep);

			}

			snd_pcm_stream_unlock_irq(substream);

		}

	list_for_each_entry(notify, &snd_pcm_notify_list, list) {

sound/core/pcm_native.c

+8 −0
Original line number Diff line number Diff line
@@ -1518,6 +1518,10 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream, 
		down_read(&snd_pcm_link_rwsem);

		snd_pcm_stream_lock_irq(substream);

		remove_wait_queue(&to_check->sleep, &wait);

		if (card->shutdown) {

			result = -ENODEV;

			break;

		}

		if (tout == 0) {

			if (substream->runtime->status->state == SNDRV_PCM_STATE_SUSPENDED)

				result = -ESTRPIPE;
@@ -2169,6 +2173,10 @@ static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream) 
		mutex_unlock(&pcm->open_mutex);

		schedule();

		mutex_lock(&pcm->open_mutex);

		if (pcm->card->shutdown) {

			err = -ENODEV;

			break;

		}

		if (signal_pending(current)) {

			err = -ERESTARTSYS;

			break;