Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 1 Jul 2019 15:01:00 +0000 (17:01 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 1 Jul 2019 15:01:55 +0000 (17:01 +0200)
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>
1  2 
sound/firewire/amdtp-am824.c
sound/firewire/fireface/ff-protocol-latter.c
sound/firewire/motu/motu-stream.c
sound/firewire/oxfw/oxfw.c
sound/pci/hda/hda_codec.c
sound/soc/sof/intel/hda.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;
Simple merge
Simple merge
Simple merge
Simple merge