ALSA: seq: Fix poll() error return

commit a49a71f6e25da2acc637fcd31e73debd96ca18f8 upstream.

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: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c
index 5f64d0d88320012fc91d6752c4388434045fbe38..e1f44fc8688563d78f9e0433494090e93a113943 100644 (file)
--- a/sound/core/seq/oss/seq_oss.c
+++ b/sound/core/seq/oss/seq_oss.c
@@ -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);
 }
 

diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
index 56ca78423040f09e6d0569b651ba631105b8bd02..6fd4b074b206f6557f36c00188ab417f87f9d394 100644 (file)
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
@@ -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) {