diff options
| author | Takashi Iwai <tiwai@suse.de> | 2025-01-20 09:25:33 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2025-01-20 09:25:33 +0100 |
| commit | 7bba999e939f6d20e4db66effeecc179ed896496 (patch) | |
| tree | 2d044d6a466a798b0c779e2fc9e66520b4aae940 /sound/core/seq | |
| parent | 8cd671d65b4255bb7ce368b4258ef4fd52798468 (diff) | |
| parent | 1a0f59b04c8c9e1177731609e62e2a439cfa3a73 (diff) | |
Merge branch 'for-linus' into for-next
Pull pending ASoC and HD-audio fixes for 6.14-rc1
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/seq')
| -rw-r--r-- | sound/core/seq/seq_clientmgr.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index 75783d69e708..073b56dc2225 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c @@ -1275,10 +1275,16 @@ static int snd_seq_ioctl_set_client_info(struct snd_seq_client *client, if (client->type != client_info->type) return -EINVAL; - /* check validity of midi_version field */ - if (client->user_pversion >= SNDRV_PROTOCOL_VERSION(1, 0, 3) && - client_info->midi_version > SNDRV_SEQ_CLIENT_UMP_MIDI_2_0) - return -EINVAL; + if (client->user_pversion >= SNDRV_PROTOCOL_VERSION(1, 0, 3)) { + /* check validity of midi_version field */ + if (client_info->midi_version > SNDRV_SEQ_CLIENT_UMP_MIDI_2_0) + return -EINVAL; + + /* check if UMP is supported in kernel */ + if (!IS_ENABLED(CONFIG_SND_SEQ_UMP) && + client_info->midi_version > 0) + return -EINVAL; + } /* fill the info fields */ if (client_info->name[0]) |