2010-07-28 13:50:15

by Stefan Richter

[permalink] [raw]
Subject: [PATCH] firewire: ohci: release channel in error path

firewire-ohci keeps book of which isochronous channels are occupied by
IR DMA contexts, so that there cannot be more than one context listening
to a certain channel.

If IR context creation failed due to an out-of-memory condition, this
bookkeeping leaked a channel.

Signed-off-by: Stefan Richter <[email protected]>
---
drivers/firewire/ohci.c | 1 +
1 file changed, 1 insertion(+)

Index: b/drivers/firewire/ohci.c
===================================================================
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -2314,6 +2314,7 @@ static struct fw_iso_context *ohci_alloc
free_page((unsigned long)ctx->header);
out:
spin_lock_irqsave(&ohci->lock, flags);
+ *channels |= 1ULL << channel;
*mask |= 1 << index;
spin_unlock_irqrestore(&ohci->lock, flags);


--
Stefan Richter
-=====-==-=- -=== ===--
http://arcgraph.de/sr/