Merge branch 'for-linus' into for-next

[linux-2.6-block.git] / sound / firewire / amdtp-am824.c

diff --git a/sound/firewire/amdtp-am824.c b/sound/firewire/amdtp-am824.c
index d09da9dbf235fef572be31beeb772ded6675129f..623d014c0e7ebb6c4aa36d9d137e22742b9a87fc 100644 (file)
--- a/sound/firewire/amdtp-am824.c
+++ b/sound/firewire/amdtp-am824.c
@@ -83,7 +83,7 @@ int amdtp_am824_set_parameters(struct amdtp_stream *s, unsigned int rate,
        if (err < 0)
                return err;
 
-       s->fdf = AMDTP_FDF_AM824 | s->sfc;
+       s->ctx_data.rx.fdf = AMDTP_FDF_AM824 | s->sfc;
 
        p->pcm_channels = pcm_channels;
        p->midi_ports = midi_ports;
@@ -321,7 +321,7 @@ static void read_midi_messages(struct amdtp_stream *s,
        u8 *b;
 
        for (f = 0; f < frames; f++) {
-               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;