summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2007-08-29 19:40:28 +0200
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-10-17 00:00:07 +0200
commitab88ca488b8af66c3defa165874e81e695319a19 (patch)
tree0f798dacb2c16317a15b043697ae2e74384ff319
parente524f616f59722bc7f93eb1fd79d3bbdcdf4f894 (diff)
downloadop-kernel-dev-ab88ca488b8af66c3defa165874e81e695319a19.zip
op-kernel-dev-ab88ca488b8af66c3defa165874e81e695319a19.tar.gz
firewire: fw-ohci: missing dma_unmap_single
at_context_queue_packet() didn't clean up in an early exit path. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Kristian Høgsberg <krh@redhat.com>
-rw-r--r--drivers/firewire/fw-ohci.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index a333748..ec70c9f 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -680,6 +680,9 @@ at_context_queue_packet(struct context *ctx, struct fw_packet *packet)
/* FIXME: Document how the locking works. */
if (ohci->generation != packet->generation) {
+ if (packet->payload_length > 0)
+ dma_unmap_single(ohci->card.device, payload_bus,
+ packet->payload_length, DMA_TO_DEVICE);
packet->ack = RCODE_GENERATION;
return -1;
}
OpenPOWER on IntegriCloud