summaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2007-02-16 17:34:45 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-03-09 22:03:01 +0100
commit1e1d196bf5d9258f9583a05c41c1c351ffcdeac2 (patch)
treef97452e8aa3bed9608ce3474a5cdec8e87d1698d /drivers/firewire
parent9b32d5f3074e9b1afaa39a360a59fd77a2214783 (diff)
downloadop-kernel-dev-1e1d196bf5d9258f9583a05c41c1c351ffcdeac2.zip
op-kernel-dev-1e1d196bf5d9258f9583a05c41c1c351ffcdeac2.tar.gz
firewire: Set correct buffer lengths for dualbuffer DMA descriptor.
Signed-off-by: Kristian Høgsberg <krh@redhat.com> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/fw-ohci.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index b5a1545..76ac70a 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -1583,10 +1583,7 @@ ohci_queue_iso_receive(struct fw_iso_context *base,
descriptor_branch_always);
db->first_size = cpu_to_le16(ctx->base.header_size);
db->first_req_count = cpu_to_le16(p->header_length);
- db->second_req_count = cpu_to_le16(p->payload_length);
- db->first_res_count = cpu_to_le16(db->first_req_count);
- db->second_res_count = cpu_to_le16(db->second_req_count);
-
+ db->first_res_count = db->first_req_count;
db->first_buffer = cpu_to_le32(d_bus + sizeof *db);
if (offset + rest < PAGE_SIZE)
@@ -1594,6 +1591,8 @@ ohci_queue_iso_receive(struct fw_iso_context *base,
else
length = PAGE_SIZE - offset;
+ db->second_req_count = cpu_to_le16(length);
+ db->second_res_count = db->second_req_count;
page_bus = page_private(buffer->pages[page]);
db->second_buffer = cpu_to_le32(page_bus + offset);
OpenPOWER on IntegriCloud