diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2021-01-18 17:39:18 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-01-18 17:39:23 +0100 |
| commit | c09e28cd1219fd267ed838e1758ff2e7b6ff3ec6 (patch) | |
| tree | 6259cbb1e1659b2720934409c67e00180ee68ba4 /sound/core/seq | |
| parent | ALSA: x86: Simplify with dma_set_mask_and_coherent() (diff) | |
| parent | ALSA: usb-audio: Avoid implicit feedback on Pioneer devices (diff) | |
| download | linux-dev-c09e28cd1219fd267ed838e1758ff2e7b6ff3ec6.tar.xz linux-dev-c09e28cd1219fd267ed838e1758ff2e7b6ff3ec6.zip | |
Merge branch 'for-linus' into for-next
Back-merge of 5.11 devel branch for more works on USB-audio.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/seq')
| -rw-r--r-- | sound/core/seq/oss/seq_oss_synth.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/seq/oss/seq_oss_synth.c b/sound/core/seq/oss/seq_oss_synth.c index 136dc663887a..722f5059b300 100644 --- a/sound/core/seq/oss/seq_oss_synth.c +++ b/sound/core/seq/oss/seq_oss_synth.c @@ -611,7 +611,8 @@ snd_seq_oss_synth_make_info(struct seq_oss_devinfo *dp, int dev, struct synth_in if (info->is_midi) { struct midi_info minf; - snd_seq_oss_midi_make_info(dp, info->midi_mapped, &minf); + if (snd_seq_oss_midi_make_info(dp, info->midi_mapped, &minf)) + return -ENXIO; inf->synth_type = SYNTH_TYPE_MIDI; inf->synth_subtype = 0; inf->nr_voices = 16; |