iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'topic/midi20' into for-next

Browse Source 
Pull fixes for a couple of minor issues spotted by bots.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2023-06-05 16:49:20 +02:00
commit 1a76499410
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/usb/midi-v2.h
View File

@ -73,7 +73,7 @@ struct usb_ms20_gr_trm_block_header_descriptor {
__u8 bLength; /* 5 */
__u8 bDescriptorType; /* USB_DT_CS_GR_TRM_BLOCK */
__u8 bDescriptorSubtype; /* USB_MS_GR_TRM_BLOCK_HEADER */
__u16 wTotalLength; /* Total number of bytes */
__le16 wTotalLength; /* Total number of bytes */
} __packed;
/* 5.4.2.1 Group Terminal Block Descriptor */
@ -87,8 +87,8 @@ struct usb_ms20_gr_trm_block_descriptor {
__u8 nNumGroupTrm; /* Number of member Group Terminals spanned */
__u8 iBlockItem; /* String ID of Block item */
__u8 bMIDIProtocol; /* Default MIDI protocol */
__u16 wMaxInputBandwidth; /* Max input bandwidth capability in 4kB/s */
__u16 wMaxOutputBandwidth; /* Max output bandwidth capability in 4kB/s */
__le16 wMaxInputBandwidth; /* Max input bandwidth capability in 4kB/s */
__le16 wMaxOutputBandwidth; /* Max output bandwidth capability in 4kB/s */
} __packed;
#endif /* __LINUX_USB_MIDI_V2_H */

2
sound/core/seq/seq_clientmgr.c
View File

@ -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);