diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-06-05 17:49:20 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-06-05 17:50:04 +0300 |
| commit | 1a764994102b150a3b9b965a33c76c2d11ff2f34 (patch) | |
| tree | 67a1a29275059170408d86e64481defa02844469 /sound/core | |
| parent | db987421b57cdf3ecb4859e0c7b49726baae895e (diff) | |
| parent | 8c15a18331191b67bdce54d21af068baec044baf (diff) | |
| download | linux-1a764994102b150a3b9b965a33c76c2d11ff2f34.tar.xz | |
Merge branch 'topic/midi20' into for-next
Pull fixes for a couple of minor issues spotted by bots.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/seq/seq_clientmgr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index 948ae45e0cc3..e3f9ea67d019 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c @@ -451,7 +451,7 @@ static ssize_t snd_seq_read(struct file *file, char __user *buf, size_t count, err = 0; snd_seq_fifo_lock(fifo); - if (client->midi_version > 0) + if (IS_ENABLED(CONFIG_SND_SEQ_UMP) && client->midi_version > 0) aligned_size = sizeof(struct snd_seq_ump_event); else aligned_size = sizeof(struct snd_seq_event); |