ALSA: firewire-motu: fix stream format for MOTU 8pre FireWire

Message ID 20210614083133.39753-1-o-takashi@sakamocchi.jp
State Accepted
Commit fc36ef80ca2c68b2c9df06178048f08280e4334f
Headers show
Series
  • ALSA: firewire-motu: fix stream format for MOTU 8pre FireWire
Related show

Commit Message

Takashi Sakamoto June 14, 2021, 8:31 a.m.
My previous refactoring for ALSA firewire-motu driver brought regression
to handle MOTU 8pre FireWire. The packet format is not operated correctly.

Cc: <stable@vger.kernel.org>
Fixes: dfbaa4dc11eb ("ALSA: firewire-motu: add model-specific table of chunk count")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---
 sound/firewire/motu/motu-protocol-v2.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Takashi Iwai June 17, 2021, 10:06 a.m. | #1
On Mon, 14 Jun 2021 10:31:33 +0200,
Takashi Sakamoto wrote:
> 
> My previous refactoring for ALSA firewire-motu driver brought regression
> to handle MOTU 8pre FireWire. The packet format is not operated correctly.
> 
> Cc: <stable@vger.kernel.org>
> Fixes: dfbaa4dc11eb ("ALSA: firewire-motu: add model-specific table of chunk count")
> Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Thanks, applied.


Takashi

Patch

diff --git a/sound/firewire/motu/motu-protocol-v2.c b/sound/firewire/motu/motu-protocol-v2.c
index e59e69ab1538..784073aa1026 100644
--- a/sound/firewire/motu/motu-protocol-v2.c
+++ b/sound/firewire/motu/motu-protocol-v2.c
@@ -353,6 +353,7 @@  const struct snd_motu_spec snd_motu_spec_8pre = {
 	.protocol_version = SND_MOTU_PROTOCOL_V2,
 	.flags = SND_MOTU_SPEC_RX_MIDI_2ND_Q |
 		 SND_MOTU_SPEC_TX_MIDI_2ND_Q,
-	.tx_fixed_pcm_chunks = {10, 6, 0},
-	.rx_fixed_pcm_chunks = {10, 6, 0},
+	// Two dummy chunks always in the end of data block.
+	.tx_fixed_pcm_chunks = {10, 10, 0},
+	.rx_fixed_pcm_chunks = {6, 6, 0},
 };