diff options
| author |  Takashi Iwai <tiwai@suse.de>
| 2018-04-25 10:41:08 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de>
| 2018-04-25 16:44:36 +0200 |
| commit | 4d31c6e41ed2f95f97a19766812797dabd82a5ee (patch) | |
| tree | e1f81f4f0108ff86f85b8e17b025b21609aec7b2 /sound/core/seq/oss/seq_oss_synth.h | |
| parent | ALSA: hda - Sanity check of access to SPDIF controls array (diff) | |
| parent | ALSA: hda - Skip jack and others for non-existing PCM streams (diff) | |
| download | linux-4d31c6e41ed2f95f97a19766812797dabd82a5ee.tar.gz linux-4d31c6e41ed2f95f97a19766812797dabd82a5ee.tar.bz2 linux-4d31c6e41ed2f95f97a19766812797dabd82a5ee.zip | |
Merge branch 'for-linus' into for-next
Back-merge 4.17-rc3 fixes for further development.
This will bump the base to 4.17-rc2, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/seq/oss/seq_oss_synth.h')
| -rw-r--r-- | sound/core/seq/oss/seq_oss_synth.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/seq/oss/seq_oss_synth.h b/sound/core/seq/oss/seq_oss_synth.h index 74ac55f166b6..a63f9e22974d 100644 --- a/sound/core/seq/oss/seq_oss_synth.h +++ b/sound/core/seq/oss/seq_oss_synth.h @@ -37,7 +37,8 @@ void snd_seq_oss_synth_cleanup(struct seq_oss_devinfo *dp); void snd_seq_oss_synth_reset(struct seq_oss_devinfo *dp, int dev); int snd_seq_oss_synth_load_patch(struct seq_oss_devinfo *dp, int dev, int fmt, const char __user *buf, int p, int c); -int snd_seq_oss_synth_is_valid(struct seq_oss_devinfo *dp, int dev); +struct seq_oss_synthinfo *snd_seq_oss_synth_info(struct seq_oss_devinfo *dp, + int dev); int snd_seq_oss_synth_sysex(struct seq_oss_devinfo *dp, int dev, unsigned char *buf, struct snd_seq_event *ev); int snd_seq_oss_synth_addr(struct seq_oss_devinfo *dp, int dev, struct snd_seq_event *ev); |