diff options
Diffstat (limited to 'drivers/firewire/ohci.c')
-rw-r--r-- | drivers/firewire/ohci.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 418415564791..a71477541dc7 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c | |||
@@ -995,7 +995,8 @@ static int at_context_queue_packet(struct context *ctx, | |||
995 | packet->ack = RCODE_SEND_ERROR; | 995 | packet->ack = RCODE_SEND_ERROR; |
996 | return -1; | 996 | return -1; |
997 | } | 997 | } |
998 | packet->payload_bus = payload_bus; | 998 | packet->payload_bus = payload_bus; |
999 | packet->payload_mapped = true; | ||
999 | 1000 | ||
1000 | d[2].req_count = cpu_to_le16(packet->payload_length); | 1001 | d[2].req_count = cpu_to_le16(packet->payload_length); |
1001 | d[2].data_address = cpu_to_le32(payload_bus); | 1002 | d[2].data_address = cpu_to_le32(payload_bus); |
@@ -1023,7 +1024,7 @@ static int at_context_queue_packet(struct context *ctx, | |||
1023 | */ | 1024 | */ |
1024 | if (ohci->generation != packet->generation || | 1025 | if (ohci->generation != packet->generation || |
1025 | reg_read(ohci, OHCI1394_IntEventSet) & OHCI1394_busReset) { | 1026 | reg_read(ohci, OHCI1394_IntEventSet) & OHCI1394_busReset) { |
1026 | if (packet->payload_length > 0) | 1027 | if (packet->payload_mapped) |
1027 | dma_unmap_single(ohci->card.device, payload_bus, | 1028 | dma_unmap_single(ohci->card.device, payload_bus, |
1028 | packet->payload_length, DMA_TO_DEVICE); | 1029 | packet->payload_length, DMA_TO_DEVICE); |
1029 | packet->ack = RCODE_GENERATION; | 1030 | packet->ack = RCODE_GENERATION; |
@@ -1059,7 +1060,7 @@ static int handle_at_packet(struct context *context, | |||
1059 | /* This packet was cancelled, just continue. */ | 1060 | /* This packet was cancelled, just continue. */ |
1060 | return 1; | 1061 | return 1; |
1061 | 1062 | ||
1062 | if (packet->payload_bus) | 1063 | if (packet->payload_mapped) |
1063 | dma_unmap_single(ohci->card.device, packet->payload_bus, | 1064 | dma_unmap_single(ohci->card.device, packet->payload_bus, |
1064 | packet->payload_length, DMA_TO_DEVICE); | 1065 | packet->payload_length, DMA_TO_DEVICE); |
1065 | 1066 | ||
@@ -1723,7 +1724,7 @@ static int ohci_cancel_packet(struct fw_card *card, struct fw_packet *packet) | |||
1723 | if (packet->ack != 0) | 1724 | if (packet->ack != 0) |
1724 | goto out; | 1725 | goto out; |
1725 | 1726 | ||
1726 | if (packet->payload_bus) | 1727 | if (packet->payload_mapped) |
1727 | dma_unmap_single(ohci->card.device, packet->payload_bus, | 1728 | dma_unmap_single(ohci->card.device, packet->payload_bus, |
1728 | packet->payload_length, DMA_TO_DEVICE); | 1729 | packet->payload_length, DMA_TO_DEVICE); |
1729 | 1730 | ||