diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 15:01:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 17:37:18 -0800 |
| commit | d61780c0d384939ef31c46b47442854d5def4623 (patch) | |
| tree | e655b4ea947c8d86cabbc3f58f406c18ae136b5f /sound/oss/cs4232.c | |
| parent | 34ad92c2388710cf24d27c896b8e6605c19a795c (diff) | |
| download | op-kernel-dev-d61780c0d384939ef31c46b47442854d5def4623.zip op-kernel-dev-d61780c0d384939ef31c46b47442854d5def4623.tar.gz | |
[PATCH] remove some more check_region stuff
Removed some more references to check_region().
I checked these changes into the 'checkreg' branch of
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6.git
The only valid references remaining are in:
drivers/scsi/advansys.c
drivers/scsi/BusLogic.c
drivers/cdrom/sbpcd.c
sound/oss/pss.c
Remove last vestiges of ide_check_region()
drivers/char/specialix: trim trailing whitespace
drivers/char/specialix: eliminate use of check_region()
Remove outdated and unused references to check_region()
[sound oss] remove check_region() usage from cs4232, wavfront
[netdrvr eepro] trim trailing whitespace
[netdrvr eepro] remove check_region() usage
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss/cs4232.c')
| -rw-r--r-- | sound/oss/cs4232.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/oss/cs4232.c b/sound/oss/cs4232.c index 6ec308f..7c59e2d 100644 --- a/sound/oss/cs4232.c +++ b/sound/oss/cs4232.c @@ -195,10 +195,12 @@ static int __init probe_cs4232(struct address_info *hw_config, int isapnp_config CS_OUT2(0x15, 0x00); /* Select logical device 0 (WSS/SB/FM) */ CS_OUT3(0x47, (base >> 8) & 0xff, base & 0xff); /* WSS base */ - if (check_region(0x388, 4)) /* Not free */ + if (!request_region(0x388, 4, "FM")) /* Not free */ CS_OUT3(0x48, 0x00, 0x00) /* FM base off */ - else + else { + release_region(0x388, 4); CS_OUT3(0x48, 0x03, 0x88); /* FM base 0x388 */ + } CS_OUT3(0x42, 0x00, 0x00); /* SB base off */ CS_OUT2(0x22, irq); /* SB+WSS IRQ */ |
