aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire/fw-ohci.c
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2007-02-16 17:34:50 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-03-09 16:03:03 -0500
commit21efb3cfc6ed49991638000f58bb23b838c76e25 (patch)
tree30b1b0ed02082b09fa844abf5888b4d3fbdadbe7 /drivers/firewire/fw-ohci.c
parente364cf4e0aa245ba2ce5942289e8a43935505e53 (diff)
firewire: Configure channel and speed at context creation time.
We need the channel number as we queue up iso packets for transmission so we can fill out the header correctly. Signed-off-by: Kristian Høgsberg <krh@redhat.com> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/fw-ohci.c')
-rw-r--r--drivers/firewire/fw-ohci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 12f109da4d8d..0088acd7718e 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -1413,7 +1413,7 @@ static int ohci_start_iso(struct fw_iso_context *base, s32 cycle)
1413 if (cycle > 0) 1413 if (cycle > 0)
1414 cycle_match = IT_CONTEXT_CYCLE_MATCH_ENABLE | 1414 cycle_match = IT_CONTEXT_CYCLE_MATCH_ENABLE |
1415 (cycle & 0x7fff) << 16; 1415 (cycle & 0x7fff) << 16;
1416 1416
1417 reg_write(ohci, OHCI1394_IsoXmitIntEventClear, 1 << index); 1417 reg_write(ohci, OHCI1394_IsoXmitIntEventClear, 1 << index);
1418 reg_write(ohci, OHCI1394_IsoXmitIntMaskSet, 1 << index); 1418 reg_write(ohci, OHCI1394_IsoXmitIntMaskSet, 1 << index);
1419 context_run(&ctx->context, cycle_match); 1419 context_run(&ctx->context, cycle_match);
@@ -1638,7 +1638,7 @@ ohci_queue_iso_receive_dualbuffer(struct fw_iso_context *base,
1638 1638
1639 return 0; 1639 return 0;
1640} 1640}
1641 1641
1642static int 1642static int
1643ohci_queue_iso_receive_bufferfill(struct fw_iso_context *base, 1643ohci_queue_iso_receive_bufferfill(struct fw_iso_context *base,
1644 struct fw_iso_packet *packet, 1644 struct fw_iso_packet *packet,