aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-23 20:00:48 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-23 20:00:48 -0700
commitae75784bc576a1af70509c2f3ba2b70bb65a0c58 (patch)
treec2439482df66e8d8aa727db70c4ec33a920b74c3
parent005940ead619c2867e0465c8e0fffb9e5989b57e (diff)
parent7087e295543d3f6e161530e07982fd979e2d9efc (diff)
Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
-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);

Privacy Policy