Skip to content

Commit 191ef57

Browse files
takaswietiwai
authored andcommitted
ALSA: firewire-motu: cancel chunk alignment for protocol version 2
For MOTU protocol version 2, this driver arranges the number of data chunks to align chunks to quadlet data channel. However, MOTU Traveler has padding bytes in the end of data block at high clock mode. This commit removes the arrangement. Fortunately, at low and middle clock mode, supported model for v2 protocol (828mkII) gets no influence from this change because all of combination for data chunks are just aligned to quadlet data channel. Signed-off-by: Takashi Sakamoto <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
1 parent 06ac0b6 commit 191ef57

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

sound/firewire/motu/motu-protocol-v2.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,9 @@ static void calculate_fixed_part(struct snd_motu_packet_format *formats,
173173
pcm_chunks[0] += 2;
174174
pcm_chunks[1] += 2;
175175

176-
/* This part should be multiples of 4. */
177-
formats->fixed_part_pcm_chunks[0] = round_up(2 + pcm_chunks[0], 4) - 2;
178-
formats->fixed_part_pcm_chunks[1] = round_up(2 + pcm_chunks[1], 4) - 2;
179-
if (flags & SND_MOTU_SPEC_SUPPORT_CLOCK_X4)
180-
formats->fixed_part_pcm_chunks[2] =
181-
round_up(2 + pcm_chunks[2], 4) - 2;
176+
formats->fixed_part_pcm_chunks[0] = pcm_chunks[0];
177+
formats->fixed_part_pcm_chunks[1] = pcm_chunks[1];
178+
formats->fixed_part_pcm_chunks[2] = pcm_chunks[2];
182179
}
183180

184181
static void calculate_differed_part(struct snd_motu_packet_format *formats,

0 commit comments

Comments
 (0)