diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-07-28 15:50:00 +0200 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-07-29 23:06:25 +0200 |
| commit | e5b06c077c592e7e1623641520787a3da7b7c6bf (patch) | |
| tree | 92669edec5be2e06ed1b971e611a7683bb33ab75 /drivers/firewire | |
| parent | firewire: ohci: use memory barriers to order descriptor updates (diff) | |
| download | linux-e5b06c077c592e7e1623641520787a3da7b7c6bf.tar.xz linux-e5b06c077c592e7e1623641520787a3da7b7c6bf.zip | |
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 <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire')
| -rw-r--r-- | drivers/firewire/ohci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 3f59d1df6504..2e4b425847a7 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c @@ -2309,6 +2309,7 @@ static struct fw_iso_context *ohci_allocate_iso_context(struct fw_card *card, 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); |