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

Commit a49a71f6 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: seq: Fix poll() error return 



The sanity checks in ALSA sequencer and OSS sequencer emulation codes
return falsely -ENXIO from poll callback.  They should be EPOLLERR
instead.

This was caught thanks to the recent change to the return value.

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

sound/core/seq/oss/seq_oss.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ odev_poll(struct file *file, poll_table * wait) 
	struct seq_oss_devinfo *dp;

	dp = file->private_data;

	if (snd_BUG_ON(!dp))

		return -ENXIO;

		return EPOLLERR;

	return snd_seq_oss_poll(dp, file, wait);

}

sound/core/seq/seq_clientmgr.c

+1 −1
Original line number Diff line number Diff line
@@ -1101,7 +1101,7 @@ static __poll_t snd_seq_poll(struct file *file, poll_table * wait) 


	/* check client structures are in place */

	if (snd_BUG_ON(!client))

		return -ENXIO;

		return EPOLLERR;



	if ((snd_seq_file_flags(file) & SNDRV_SEQ_LFLG_INPUT) &&

	    client->data.user.fifo) {