1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 9e8a8f909303..a9e13468f60c 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -813,8 +813,10 @@ handle_local_request(struct context *ctx, struct fw_packet *packet)
         u64 offset;
         u32 csr;
 
-        packet->ack = ACK_PENDING;
-        packet->callback(packet, &ctx->ohci->card, packet->ack);
+        if (ctx == &ctx->ohci->at_request_ctx) {
+                packet->ack = ACK_PENDING;
+                packet->callback(packet, &ctx->ohci->card, packet->ack);
+        }
 
         offset =
                 ((unsigned long long)
@@ -839,6 +841,11 @@ handle_local_request(struct context *ctx, struct fw_packet *packet)
                         fw_core_handle_response(&ctx->ohci->card, packet);
                 break;
         }
+
+        if (ctx == &ctx->ohci->at_response_ctx) {
+                packet->ack = ACK_COMPLETE;
+                packet->callback(packet, &ctx->ohci->card, packet->ack);
+        }
 }
 
 static void