diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-04-13 10:09:40 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-04-13 10:09:46 +0200 |
| commit | 99fff44fe339b21c6a4ddd6c1239e587dd439cd3 (patch) | |
| tree | 132e59f06c467786f21b9b67a5a031936850b384 /sound/core/seq/oss | |
| parent | 6b580f523172f2c738b661069a57c23c74a75f88 (diff) | |
| parent | 183ab39eb0ea9879bb68422a83e65f750f3192f0 (diff) | |
| download | linux-99fff44fe339b21c6a4ddd6c1239e587dd439cd3.tar.bz2 | |
Merge branch 'for-linus' into for-next
Back-merge the 5.1 devel branch for the further HD-audio development.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/seq/oss')
| -rw-r--r-- | sound/core/seq/oss/seq_oss_synth.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/core/seq/oss/seq_oss_synth.c b/sound/core/seq/oss/seq_oss_synth.c index 278ebb993122..c93945917235 100644 --- a/sound/core/seq/oss/seq_oss_synth.c +++ b/sound/core/seq/oss/seq_oss_synth.c @@ -617,13 +617,14 @@ int snd_seq_oss_synth_make_info(struct seq_oss_devinfo *dp, int dev, struct synth_info *inf) { struct seq_oss_synth *rec; + struct seq_oss_synthinfo *info = get_synthinfo_nospec(dp, dev); - if (dev < 0 || dev >= dp->max_synthdev) + if (!info) return -ENXIO; - if (dp->synths[dev].is_midi) { + if (info->is_midi) { struct midi_info minf; - snd_seq_oss_midi_make_info(dp, dp->synths[dev].midi_mapped, &minf); + snd_seq_oss_midi_make_info(dp, info->midi_mapped, &minf); inf->synth_type = SYNTH_TYPE_MIDI; inf->synth_subtype = 0; inf->nr_voices = 16; |