Commit 1a764994 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/midi20' into for-next 



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

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents db987421 8c15a183

include/linux/usb/midi-v2.h

+3 −3
Original line number Diff line number Diff line
@@ -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 */

sound/core/seq/seq_clientmgr.c

+1 −1
Original line number Diff line number Diff line
@@ -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);