summaryrefslogtreecommitdiff
path: root/sound/oss
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2005-08-04 14:40:25 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-23 01:38:22 -0400
commit7087e295543d3f6e161530e07982fd979e2d9efc (patch)
tree1afe8332ceea5ac34fa8ccd53c914c427e5894c3 /sound/oss
parentf6fdd7d9c273bb2a20ab467cb57067494f932fa3 (diff)
[PATCH] i810_audio: fix release_region misordering in error exit from i810_probe
Re-order release_region calls in i810_probe to properly unwind preceding allocations. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/i810_audio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c
index 7e9f667cf7a7..b9a640fe48b1 100644
--- a/sound/oss/i810_audio.c
+++ b/sound/oss/i810_audio.c
@@ -3430,9 +3430,9 @@ out_iospace:
release_mem_region(card->iobase_mmio_phys, 256);
}
out_pio:
- release_region(card->iobase, 64);
-out_region2:
release_region(card->ac97base, 256);
+out_region2:
+ release_region(card->iobase, 64);
out_region1:
pci_free_consistent(pci_dev, sizeof(struct i810_channel)*NR_HW_CH,
card->channel, card->chandma);