diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-07-29 22:38:54 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-07-29 22:39:29 +0200 |
| commit | 16c796e8fac353d736055322ca6a38ba3c49f5e2 (patch) | |
| tree | a8557b6c660d067834ece2421a1d6ffe990b60af /sound/core/seq/oss/seq_oss.c | |
| parent | f69548ffafcc4942022f16f2f192b24143de1dba (diff) | |
| parent | f59cf9a0551dd954ad8b752461cf19d9789f4b1d (diff) | |
| download | linux-16c796e8fac353d736055322ca6a38ba3c49f5e2.tar.gz linux-16c796e8fac353d736055322ca6a38ba3c49f5e2.tar.bz2 linux-16c796e8fac353d736055322ca6a38ba3c49f5e2.zip | |
Merge branch 'for-linus' into topic/virmidi
Pull the latest ALSA sequencer fixes for the further development of
virmidi.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/seq/oss/seq_oss.c')
| -rw-r--r-- | sound/core/seq/oss/seq_oss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c index 5f64d0d88320..e1f44fc86885 100644 --- 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); } |