From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 1 Jul 2019 15:01:00 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b5c21c84705dbd96a0fff930d33022a17910b4f4;p=android-x86%2Fkernel.git

Merge branch 'for-linus' into for-next

This back-merge is necessary for adjusting the latest FireWire fix
with the recent refactoring in 5.3 development branch.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

b5c21c84705dbd96a0fff930d33022a17910b4f4
diff --cc sound/firewire/amdtp-am824.c
index 7019a2143581,d09da9dbf235..623d014c0e7e
--- a/sound/firewire/amdtp-am824.c
+++ b/sound/firewire/amdtp-am824.c
@@@ -321,7 -321,7 +321,7 @@@ static void read_midi_messages(struct a
  	u8 *b;
  
  	for (f = 0; f < frames; f++) {
- 		port = (s->data_block_counter + f) % 8;
 -		port = (8 - s->tx_first_dbc + s->data_block_counter + f) % 8;
++		port = (8 - s->ctx_data.tx.first_dbc + s->data_block_counter + f) % 8;
  		b = (u8 *)&buffer[p->midi_position];
  
  		len = b[0] - 0x80;