From 34134ae0c7689bde1ceabb73371b428813f042c3 Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Mon, 12 Mar 2012 21:45:47 +0100 Subject: [PATCH] --- yaml --- r: 294125 b: refs/heads/master c: 0c0efbacab8d70700d13301e0ae7975783c0cb0a h: refs/heads/master i: 294123: f1cb014a76848980679130208cb75b8c67e59557 v: v3 --- [refs] | 2 +- trunk/drivers/firewire/ohci.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3ed6dfbf08ef..245111d564b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfda62baa474b194802a555d3f7f2ccfa27e28bb +refs/heads/master: 0c0efbacab8d70700d13301e0ae7975783c0cb0a diff --git a/trunk/drivers/firewire/ohci.c b/trunk/drivers/firewire/ohci.c index 384b5b08126c..e52615a14382 100644 --- a/trunk/drivers/firewire/ohci.c +++ b/trunk/drivers/firewire/ohci.c @@ -2751,7 +2751,7 @@ static int handle_ir_buffer_fill(struct context *context, container_of(context, struct iso_context, context); u32 buffer_dma; - if (!last->transfer_status) + if (last->res_count != 0) /* Descriptor(s) not done yet, stop iteration */ return 0; @@ -2765,8 +2765,7 @@ static int handle_ir_buffer_fill(struct context *context, if (le16_to_cpu(last->control) & DESCRIPTOR_IRQ_ALWAYS) ctx->base.callback.mc(&ctx->base, le32_to_cpu(last->data_address) + - le16_to_cpu(last->req_count) - - le16_to_cpu(last->res_count), + le16_to_cpu(last->req_count), ctx->base.callback_data); return 1;